fix: change textbookSubscription

Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change sending"
+	git commit --no-verify -m "fix: change textbookSubscription"
 
 checkPre:
 	git checkout pre

src/services/apis/BaseNewStudentReportController.ts

@@ -0,0 +1,59 @@
+// @ts-ignore
+/* eslint-disable */
+
+// 该文件自动生成，请勿手动修改！
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+            // --------------------------------------------------------------------------
+            // Base New Student Report Controller
+            // --------------------------------------------------------------------------
+
+            ;
+
+
+            /** 新增新生维护信息 POST /student/baseNewStudentReport */
+export async function postStudentBaseNewStudentReport(params:API.AddBaseNewStudentDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/baseNewStudentReport', data:params},{errorMessageMode:mode});}
+/** 修改新生维护信息 PUT /student/baseNewStudentReport */
+export async function putStudentBaseNewStudentReport(params:API.UpdateBaseNewStudentDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
+        ({url: '/student/baseNewStudentReport', data:params},{errorMessageMode:mode});}
+/** 删除新生维护信息 DELETE /student/baseNewStudentReport */
+export async function deleteStudentBaseNewStudentReport(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
+        ({url: '/student/baseNewStudentReport', data:params},{errorMessageMode:mode});}
+/** 激活账号 POST /student/baseNewStudentReport/active-account */
+export async function postBaseNewStudentReportActiveAccount(params:API.ActiveAccountDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/baseNewStudentReport/active-account', data:params},{errorMessageMode:mode});}
+/** 修改分班状态 POST /student/baseNewStudentReport/change-banding-status */
+export async function postBaseNewStudentReportChangeBandingStatus(params:API.ChangeBandingStatusDto[]
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/baseNewStudentReport/change-banding-status', data:params},{errorMessageMode:mode});}
+/** 删除新生(保留新生信息，删除基础信息) DELETE /student/baseNewStudentReport/deleteByUserIds */
+export async function deleteBaseNewStudentReportDeleteByUserIds(params:API.DeleteNewStudentDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
+        ({url: '/student/baseNewStudentReport/deleteByUserIds', data:params},{errorMessageMode:mode});}
+/** 导入 POST /student/baseNewStudentReport/import */
+export async function postBaseNewStudentReportImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<API.Map[]>
+        ({url: '/student/baseNewStudentReport/import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}
+/** 根据id查询新生维护信息信息 GET /student/baseNewStudentReport/info */
+export async function getBaseNewStudentReportInfo(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.BaseNewStudentVo>
+        ({url: '/student/baseNewStudentReport/info', params:params},{errorMessageMode:mode});}
+/** 新生维护信息列表(分页) GET /student/baseNewStudentReport/page */
+export async function getBaseNewStudentReportPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.BaseNewStudentPageVo>>
+        ({url: '/student/baseNewStudentReport/page', params:params},{errorMessageMode:mode});}
+/** 导出 POST /student/baseNewStudentReport/report-export-query */
+export async function postBaseNewStudentReportReportExportQuery(params:API.PageInput_1
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/student/baseNewStudentReport/report-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
+/** 新生报到(分页) GET /student/baseNewStudentReport/report-page */
+export async function getBaseNewStudentReportReportPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.BaseNewStudentPageVo>>
+        ({url: '/student/baseNewStudentReport/report-page', params:params},{errorMessageMode:mode});}
+/** 成绩导入 POST /student/baseNewStudentReport/score-import */
+export async function postBaseNewStudentReportScoreImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<API.Map[]>
+        ({url: '/student/baseNewStudentReport/score-import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}
+/** 新生维护信息树 GET /student/baseNewStudentReport/tree */
+export async function getBaseNewStudentReportTree(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.BaseNewStudentTreeVo[]>
+        ({url: '/student/baseNewStudentReport/tree', params:params},{errorMessageMode:mode});}
+            

src/services/apis/StudentReportPlanController.ts

@@ -35,4 +35,7 @@ export async function getStudentReportPlanPage(params:any,mode: ErrorMessageMode
 /** 学期计划树 GET /student/studentReportPlan/tree */
 export async function getStudentReportPlanTree(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.StudentReportPlanTreeVo[]>
         ({url: '/student/studentReportPlan/tree', params:params},{errorMessageMode:mode});}
+/** 根据分班任务id查询试读报到计划信息 GET /student/studentReportPlan/try-reading-plan */
+export async function getStudentReportPlanTryReadingPlan(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.StudentReportPlanVo>
+        ({url: '/student/studentReportPlan/try-reading-plan', params:params},{errorMessageMode:mode});}
             

src/services/apis/StudentTryReadingReportController.ts

@@ -0,0 +1,40 @@
+// @ts-ignore
+/* eslint-disable */
+
+// 该文件自动生成，请勿手动修改！
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+            // --------------------------------------------------------------------------
+            // Student Try Reading Report Controller
+            // --------------------------------------------------------------------------
+
+            ;
+
+
+            /** 变更为已报到 POST /student/tryReadingReport/all-sign */
+export async function postTryReadingReportAllSign(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/tryReadingReport/all-sign', data:params},{errorMessageMode:mode});}
+/** 调整班级 POST /student/tryReadingReport/change-class */
+export async function postTryReadingReportChangeClass(params:API.StudentReportSignDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/tryReadingReport/change-class', data:params},{errorMessageMode:mode});}
+/** 非本班学生 POST /student/tryReadingReport/clear-class */
+export async function postTryReadingReportClearClass(params:API.ChangeBandingStatusDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/tryReadingReport/clear-class', data:params},{errorMessageMode:mode});}
+/** 导出 POST /student/tryReadingReport/export-query */
+export async function postTryReadingReportExportQuery(params:API.PageInput_14
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/student/tryReadingReport/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
+/** 试读报到(分页) GET /student/tryReadingReport/page */
+export async function getTryReadingReportPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.StudentReportRecordPlanPageVo>>
+        ({url: '/student/tryReadingReport/page', params:params},{errorMessageMode:mode});}
+/** 试读报到 POST /student/tryReadingReport/sign */
+export async function postTryReadingReportSign(params:API.StudentReportSignDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/tryReadingReport/sign', data:params},{errorMessageMode:mode});}
+/** 切换就读方式 POST /student/tryReadingReport/update-stduyStatus */
+export async function postTryReadingReportUpdateStduyStatus(params:API.StudentReportSignDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/student/tryReadingReport/update-stduyStatus', data:params},{errorMessageMode:mode});}
+            

src/services/apis/TextbookSubscriptionController.ts

@@ -76,6 +76,10 @@ export async function getTextbookSubscriptionList(params:any,mode: ErrorMessageM
 /** 教材教辅征订记录列表(分页) GET /textbook/textbookSubscription/page */
 export async function getTextbookSubscriptionPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookSubscriptionPageVo>>
         ({url: '/textbook/textbookSubscription/page', params:params},{errorMessageMode:mode});}
+/** 教材征订导出 POST /textbook/textbookSubscription/subscription-export-query */
+export async function postTextbookSubscriptionSubscriptionExportQuery(params:API.SubscriptionExportQueryDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/textbook/textbookSubscription/subscription-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 教材征订教材入库模板条件导出 POST /textbook/textbookSubscription/subscription-instockroom-export-query */
 export async function postTextbookSubscriptionSubscriptionInstockroomExportQuery(params:API.TextbookSubscriptionExportQueryListDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>

src/services/apis/index.ts

@@ -126,6 +126,7 @@ import * as StatisticsController from './StatisticsController';
 import * as BaseClassMajorSetController from './BaseClassMajorSetController';
 import * as BaseMajorCategorController from './BaseMajorCategorController';
 import * as BaseNewStudentController from './BaseNewStudentController';
+import * as BaseNewStudentReportController from './BaseNewStudentReportController';
 import * as BaseStudentAssessmentItemController from './BaseStudentAssessmentItemController';
 import * as BaseStudentBehaviorManageController from './BaseStudentBehaviorManageController';
 import * as BaseStudentBursariesApplicantController from './BaseStudentBursariesApplicantController';
@@ -169,6 +170,7 @@ import * as StudentHonorsController from './StudentHonorsController';
 import * as StudentReportPlanController from './StudentReportPlanController';
 import * as StudentReportRecordController from './StudentReportRecordController';
 import * as StudentManagerController from './StudentManagerController';
+import * as StudentTryReadingReportController from './StudentTryReadingReportController';
 import * as WfCadreCandidateController from './WfCadreCandidateController';
 import * as StudentStatisticsController from './StudentStatisticsController';
 import * as LoginController from './LoginController';
@@ -480,6 +482,8 @@ BaseClassMajorSetController,
 BaseMajorCategorController,
 /** Base New Student Controller */
 BaseNewStudentController,
+/** Base New Student Report Controller */
+BaseNewStudentReportController,
 /** Base Student Assessment Item Controller */
 BaseStudentAssessmentItemController,
 /** Base Student Behavior Manage Controller */
@@ -566,6 +570,8 @@ StudentReportPlanController,
 StudentReportRecordController,
 /** Student Manager Controller */
 StudentManagerController,
+/** Student Try Reading Report Controller */
+StudentTryReadingReportController,
 /** Wf Cadre Candidate Controller */
 WfCadreCandidateController,
 /** Student Statistics Controller */

src/services/typing.d.ts

@@ -12399,6 +12399,8 @@ classIdCN?: string;
 compileName?: string;
 /** 封面 */
 cover?: string;
+/** 封面url */
+coverUrl?: string;
 /** 创建人名字 */
 createUserName?: string;
 /** 备注 */
@@ -12991,6 +12993,8 @@ classId?: string;
 className?: string;
 /** 身份证号 */
 credentialNumber?: string;
+/** 招生计划id(enrollment_plan) */
+enrollmentPlanId?: string;
 /** 排序字段 */
 field?: string;
 /** 年级id */
@@ -17787,6 +17791,8 @@ userId?: string;
 }
 
 type StudentReportSignDto = {
+/** 班级id */
+classId?: string;
 /** 主键id */
 id?: string;
 }
@@ -17951,6 +17957,11 @@ sortCode?: number;
 subjectGroupCourseList?: SubjectGroupCoursePageVo[];
 }
 
+type SubscriptionExportQueryDto = {
+/** 教材教辅增订记录表主键(textbook_subscription) */
+textbookSubscriptionId?: string;
+}
+
 type SubscriptionItemListDistributeVo = {
 /** 实际价格(元) */
 actulPrice?: number;

src/views/educational/basicInformation/components/tree.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mr-2 overflow-hidden bg-white h-full">
     <BasicTree
-      :title="t('招生计划')"
+      :title="title"
       toolbar
       search
       :clickRowToExpand="true"
@@ -23,6 +23,12 @@
   export default defineComponent({
     name: 'ClassTree',
     components: { BasicTree },
+    props: {
+      title: {
+        type: String,
+        default: '招生计划',
+      },
+    },
 
     emits: ['select'],
     setup(_, { emit }) {

src/views/educational/probation/report/data.config.ts

@@ -37,7 +37,7 @@ export const tableColumns: BasicColumn[] = [
   },
   {
     title: '性别',
-    dataIndex: 'genderCn',
+    dataIndex: 'gender',
     align: 'left',
     width: 80,
   },
@@ -55,7 +55,7 @@ export const tableColumns: BasicColumn[] = [
   },
   {
     title: '家长联系电话',
-    dataIndex: 'familyMobile',
+    dataIndex: 'parentMobile',
     align: 'left',
     width: 120,
   },
@@ -124,7 +124,7 @@ export const tableColumns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'classId',
+    field: 'className',
     label: '班级',
     component: 'Input',
     colProps: { span: 8 },
@@ -150,7 +150,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 8 },
   },
   {
-    field: 'source',
+    field: 'studentType',
     label: '学生来源',
     component: 'ApiSelect',
     colProps: { span: 8 },
@@ -204,7 +204,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: '[startDate,endDate]',
+    field: '[reportTimeStart,reportTimeEnd]',
     label: '报到日期',
     component: 'RangePicker',
     componentProps: {

src/views/educational/probation/report/index.vue

@@ -4,10 +4,6 @@
   import { searchFormSchema, tableColumns } from './data.config';
   import ClassTree from '/@/views/educational/basicInformation/components/tree.vue';
   import { computed, reactive } from 'vue';
-  import {
-    postBaseNewStudentReportExportQuery,
-    getBaseNewStudentReportPage,
-  } from '/@/services/apis/BaseNewStudentController';
   import { Recordable } from 'vite-plugin-mock';
   import { useModal } from '/@/components/Modal';
   import FormEdit from './edit.vue';
@@ -15,8 +11,13 @@
   import { formatToDate } from '/@/utils/dateUtil';
   import { downloadByData } from '/@/utils/file/download';
   import { useLoading } from '/@/components/Loading';
-  import { postStudentReportRecordUpdateStduyStatus } from '/@/services/apis/StudentReportRecordController';
   import FormAdjust from './adjust.vue';
+  import {
+    getTryReadingReportPage,
+    postTryReadingReportAllSign,
+    postTryReadingReportExportQuery,
+    postTryReadingReportUpdateStduyStatus,
+  } from '/@/services/apis/StudentTryReadingReportController';
 
   const searchInfo = reactive<Recordable>({});
 
@@ -28,7 +29,7 @@
   });
 
   const [registerTable, { reload, getSelectRowKeys, getForm, clearSelectedRowKeys }] = useTable({
-    api: getBaseNewStudentReportPage,
+    api: getTryReadingReportPage,
     title: '学生列表',
     rowKey: 'id',
     columns: tableColumns,
@@ -87,7 +88,7 @@
   const handleExport = async () => {
     const postData = getForm().getFieldsValue();
     downloadByData(
-      (await postBaseNewStudentReportExportQuery({ ...postData, ...searchInfo })).data,
+      (await postTryReadingReportExportQuery({ ...postData, ...searchInfo })).data,
       `新生列表${formatToDate(new Date())}.xlsx`,
     );
   };
@@ -95,12 +96,12 @@
   const handleChangeReport = async () => {
     try {
       openFullLoading();
-      const keys: Recordable[] = [];
+      const keys: string[] = [];
       getSelectRowKeys().forEach((item) => {
-        keys.push({ id: item });
+        keys.push(item);
       });
       if (keys.length > 0) {
-        // await postStudentReportRecordAllSign(keys);
+        await postTryReadingReportAllSign(keys);
         clearSelectedRowKeys();
         await reload();
       }
@@ -116,7 +117,7 @@
       content: '确认切换当前学生就读方式？',
       onOk: async () => {
         try {
-          await postStudentReportRecordUpdateStduyStatus({ id: record.id });
+          await postTryReadingReportUpdateStduyStatus({ id: record.id });
           createMessage.success('切换成功');
           await reload();
         } catch (e) {
@@ -138,7 +139,7 @@
 
 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <ClassTree class="w-1/3 xl:w-1/4" @select="handleSelect" />
+    <ClassTree class="w-1/3 xl:w-1/4" @select="handleSelect" title="年级列表" />
     <BasicTable class="w-2/3 xl:w-3/4" @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <a-button type="primary" @click="handleDeleteBatch">报到日期设置</a-button>

src/views/educational/textbookSubscription/components/view.vue

@@ -15,6 +15,7 @@
   import {
     getTextbookSubscriptionDetail,
     getTextbookSubscriptionItemPage,
+    postTextbookSubscriptionSubscriptionInstockroomExportQuery,
   } from '/@/services/apis/TextbookSubscriptionController';
   defineEmits(['success', 'register']);
   const dataInfo = ref<any>({});
@@ -67,7 +68,7 @@
   const { createMessage } = useMessage();
   const handleExport = async () => {
     try {
-      const data: any = await postWfTextbookSubscriptionTextbookSubscriptionExportQuery({
+      const data: any = await postTextbookSubscriptionSubscriptionInstockroomExportQuery({
         textbookSubscriptionId: itemId.value,
       });
       downloadByData(
@@ -118,7 +119,7 @@
       <BasicTable @register="tableReg">
         <template #toolbar>
           <a-button type="primary" @click="openChangeHistory(true, itemId)">变更记录</a-button>
-          <!-- <a-button type="primary" @click="handleExport">导出</a-button> -->
+          <a-button type="primary" @click="handleExport">导出</a-button>
         </template>
         <template #action="{ record }">
           <a-button

src/views/teachingManager/sending/data.config.ts

@@ -4,7 +4,7 @@ import { getDataOption } from '/@/api/system/dic';
 import { BasicOptionModel } from '/@/api/model/baseModel';
 
 export const distributeStatusList: BasicOptionModel[] = [
-  { label: '未发放', value: 1},
+  { label: '未发放', value: 1 },
   { label: '全部领取', value: 3 },
   { label: '部分领取', value: 2 },
 ];