feat:修改分班

src/services/apis/BandingTaskClassController.ts

@@ -35,9 +35,10 @@ export async function getBandingTaskClassClassSure(params:any,mode: ErrorMessage
 /** 根据专业和年级查询班级 GET /banding/bandingTaskClass/classListParam */
 export async function getBandingTaskClassClassListParam(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.BandingTaskClassVo[]>
         ({url: '/banding/bandingTaskClass/classListParam', params:params},{errorMessageMode:mode});}
-/** 导出学生列表 GET /banding/bandingTaskClass/export */
-export async function getBandingTaskClassExport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<any>
-        ({url: '/banding/bandingTaskClass/export',responseType:'blob', params:params},{errorMessageMode:mode});}
+/** 导出学生列表 POST /banding/bandingTaskClass/export-query */
+export async function postBandingTaskClassExportQuery(params:API.PageInput_1
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/banding/bandingTaskClass/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 导入 POST /banding/bandingTaskClass/import */
 export async function postBandingTaskClassImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/banding/bandingTaskClass/import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}

src/services/apis/ConsumptionController.ts

@@ -12,7 +12,7 @@ import { ErrorMessageMode } from '/#/axios';
 
 
             /** 班级欠费排序-导出 POST /student/consumption/class-qf-export-query */
-export async function postConsumptionClassQfExportQuery(params:API.PageInput_1
+export async function postConsumptionClassQfExportQuery(params:API.PageInput_2
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
         ({url: '/student/consumption/class-qf-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 班级欠费排序 GET /student/consumption/class-qf-page */
@@ -25,7 +25,7 @@ export async function getConsumptionCostInformation(params:any,mode: ErrorMessag
 export async function getConsumptionDetailPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.PbVXssfdetailPageVo>>
         ({url: '/student/consumption/detail-page', params:params},{errorMessageMode:mode});}
 /** 有参导出 POST /student/consumption/export-query */
-export async function postConsumptionExportQuery(params:API.PageInput_2
+export async function postConsumptionExportQuery(params:API.PageInput_3
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
         ({url: '/student/consumption/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 学生缴费的详情 GET /student/consumption/fee-detail */

src/services/apis/FormExecuteController.ts

@@ -32,7 +32,7 @@ export async function postAppList(params:API.AppFormExecuteListDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/form/execute/app/list', data:params},{errorMessageMode:mode});}
 /** App 自定义表单根据配置获取列表数据 分页 POST /form/execute/app/page */
-export async function postAppPage(params:API.PageInput_3
+export async function postAppPage(params:API.PageInput_4
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/form/execute/app/page', data:params},{errorMessageMode:mode});}
 /** app 修改 POST /form/execute/app/update */
@@ -62,7 +62,7 @@ export async function postExecuteList(params:API.FormExecuteListDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/form/execute/list', data:params},{errorMessageMode:mode});}
 /** 自定义表单根据配置获取列表数据 分页 POST /form/execute/page */
-export async function postExecutePage(params:API.PageInput_4
+export async function postExecutePage(params:API.PageInput_5
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/form/execute/page', data:params},{errorMessageMode:mode});}
 /** 修改 POST /form/execute/update */

src/services/apis/RoomBedAdjustController.ts

@@ -12,14 +12,14 @@ import { ErrorMessageMode } from '/#/axios';
 
 
             /** 修改学生的寝室床位 PUT /room/roomBedAdjust */
-export async function putRoomRoomBedAdjust(params:API.PageInput_5
+export async function putRoomRoomBedAdjust(params:API.PageInput_6
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
         ({url: '/room/roomBedAdjust', data:params},{errorMessageMode:mode});}
 /** 批量移出学生 DELETE /room/roomBedAdjust */
 export async function deleteRoomRoomBedAdjust(params:string,mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
         ({url: '/room/roomBedAdjust', data:params},{errorMessageMode:mode});}
 /** 批量修改学生的寝室床位 PUT /room/roomBedAdjust/adjustBedBatch */
-export async function putRoomBedAdjustAdjustBedBatch(params:API.PageInput_5[]
+export async function putRoomBedAdjustAdjustBedBatch(params:API.PageInput_6[]
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
         ({url: '/room/roomBedAdjust/adjustBedBatch', data:params},{errorMessageMode:mode});}
 /** 床位学生列表 GET /room/roomBedAdjust/bed-student */

src/services/apis/SystemUpdateMessageController.ts

@@ -12,11 +12,11 @@ import { ErrorMessageMode } from '/#/axios';
 
 
             /** 新增系统消息 POST /system/systemUpdateMessage */
-export async function postSystemSystemUpdateMessage(params:API.PageInput_6
+export async function postSystemSystemUpdateMessage(params:API.PageInput_7
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/system/systemUpdateMessage', data:params},{errorMessageMode:mode});}
 /** 修改系统消息 PUT /system/systemUpdateMessage */
-export async function putSystemSystemUpdateMessage(params:API.PageInput_7
+export async function putSystemSystemUpdateMessage(params:API.PageInput_8
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
         ({url: '/system/systemUpdateMessage', data:params},{errorMessageMode:mode});}
 /** 删除系统消息 DELETE /system/systemUpdateMessage */

src/services/apis/WfSubscriptionController.ts

@@ -16,7 +16,7 @@ export async function postLedgerWfSubscription(params:API.AddWfSubscriptionDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/ledger/wfSubscription', data:params},{errorMessageMode:mode});}
 /** 导出 POST /ledger/wfSubscription/export-query */
-export async function postWfSubscriptionExportQuery(params:API.PageInput_8
+export async function postWfSubscriptionExportQuery(params:API.PageInput_9
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
         ({url: '/ledger/wfSubscription/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 物品申购台账列表(分页) GET /ledger/wfSubscription/page */

src/services/typing.d.ts

@@ -10095,22 +10095,56 @@ treeType?: number;
 
 /** 分页入参 */
 type PageInput_1 = {
+/** 分班任务(banding_task) */
+bandingTaskId?: string;
+/** 班级名称 */
+className?: string;
+/** 学号 */
+credentialNumber?: string;
+/** 招生类型 */
+enrollType?: string;
 /** 排序字段 */
 field?: string;
 /** 年级id */
 gradeId?: string;
+/** 毕业班级 */
+graduateClass?: string;
+/** 毕业学校 */
+graduateSchool?: string;
 /** 关键词 */
 keyword?: string;
 /** 当前页标 */
 limit?: number;
+/** 姓名 */
+name?: string;
 /** 排序方式 asc  desc */
 order?: string;
 /** 每页大小 */
 size?: number;
+/** 班级状态 */
+status?: string;
+/** 就读方式 */
+stduyStatus?: string;
 }
 
 /** 分页入参 */
 type PageInput_2 = {
+/** 排序字段 */
+field?: string;
+/** 年级id */
+gradeId?: string;
+/** 关键词 */
+keyword?: string;
+/** 当前页标 */
+limit?: number;
+/** 排序方式 asc  desc */
+order?: string;
+/** 每页大小 */
+size?: number;
+}
+
+/** 分页入参 */
+type PageInput_3 = {
 /** 缴费类型(-1:退费 1:缴费) */
 category?: number;
 /** 班级Id */
@@ -10146,7 +10180,7 @@ studentId?: string;
 }
 
 /** 分页入参 */
-type PageInput_3 = {
+type PageInput_4 = {
 /** 排序字段 */
 field?: string;
 funcId?: string;
@@ -10164,7 +10198,7 @@ size?: number;
 }
 
 /** 分页入参 */
-type PageInput_4 = {
+type PageInput_5 = {
 /** 排序字段 */
 field?: string;
 isTemplate?: boolean;
@@ -10182,7 +10216,7 @@ size?: number;
 }
 
 /** 分页入参 */
-type PageInput_5 = {
+type PageInput_6 = {
 /** 床位id */
 bedId?: string;
 /** 排序字段 */
@@ -10200,7 +10234,7 @@ studentUserId?: string;
 }
 
 /** 分页入参 */
-type PageInput_6 = {
+type PageInput_7 = {
 /** 消息内容 */
 content?: string;
 /** 排序字段 */
@@ -10224,7 +10258,7 @@ titleColor?: string;
 }
 
 /** 分页入参 */
-type PageInput_7 = {
+type PageInput_8 = {
 /** 消息内容 */
 content?: string;
 /** 排序字段 */
@@ -10249,7 +10283,7 @@ titleColor?: string;
 }
 
 /** 分页入参 */
-type PageInput_8 = {
+type PageInput_9 = {
 /** 结束时间 */
 endDate?: string;
 /** 排序字段 */

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

@@ -65,6 +65,7 @@
       const postParams = {
         newStudentIds: newStudentIds,
         bandingTaskClassId: values.classId,
+        isHandle: 1,
       };
       await postBandingTaskClassChangeClass(postParams as API.ChangeClassDto);
 

src/views/educational/division/components/DsionStep4.vue

@@ -16,7 +16,7 @@
   import { table4Columns, searchForm4Schema } from '../data.config';
   import {
     getBandingTaskClassClassStudent,
-    getBandingTaskClassExport,
+    postBandingTaskClassExportQuery,
   } from '/@/services/apis/BandingTaskClassController';
   import FormAdjust from './adjust.vue';
   import { useModal } from '/@/components/Modal';
@@ -25,7 +25,7 @@
 
   const [registerModal, { openModal }] = useModal();
 
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getSelectRows, getForm }] = useTable({
     api: getBandingTaskClassClassStudent,
     title: '学生列表',
     rowKey: 'id',
@@ -84,8 +84,10 @@
   };
 
   const handelExport = async () => {
-    // const postData = getForm().getFieldsValue();
-    const data = await getBandingTaskClassExport({});
+    const postData = getForm().getFieldsValue();
+    postData['bandingTaskId'] = searchInfo.bandingTaskId;
+    // console.log('handelExport', postData);
+    const data = await postBandingTaskClassExportQuery(postData);
     downloadByData(data.data, `学生列表${formatToDateTime(new Date(), 'YYYYMMDDHHmmss')}.xlsx`);
   };
 

src/views/educational/division/data.config.ts

@@ -276,7 +276,7 @@ export const searchForm4Schema: FormSchema[] = [
       getPopupContainer: () => document.body,
       options: [
         { label: '未分班', value: '0' },
-        { label: '已分班', value: '' },
+        { label: '已分班', value: '1' },
       ],
     },
     colProps: { span: 8 },