Merge branch 'dev' of https://git.yingcaibx.com/tl/web into dev

src/services/apis/WfTextbookSubscriptionController.ts

@@ -43,6 +43,9 @@ export async function getWfTextbookSubscriptionInfo(params:any,mode: ErrorMessag
 export async function postWfTextbookSubscriptionInstockroom(params:API.TextbookInstockroomDto[]
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/textbook/wfTextbookSubscription/instockroom', data:params},{errorMessageMode:mode});}
+/** 教材征订入库数量导入 POST /textbook/wfTextbookSubscription/instockroom-excel-import */
+export async function postWfTextbookSubscriptionInstockroomExcelImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/textbook/wfTextbookSubscription/instockroom-excel-import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}
 /** 教材教辅征订入库列表 GET /textbook/wfTextbookSubscription/instockroom-list */
 export async function getWfTextbookSubscriptionInstockroomList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookInstockroomListVo[]>
         ({url: '/textbook/wfTextbookSubscription/instockroom-list', params:params},{errorMessageMode:mode});}

src/services/apis/WhitelistManagementController.ts

@@ -0,0 +1,37 @@
+// @ts-ignore
+/* eslint-disable */
+
+// 该文件自动生成，请勿手动修改！
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+            // --------------------------------------------------------------------------
+            // Whitelist Management Controller
+            // --------------------------------------------------------------------------
+
+            ;
+
+
+            /** 新增白名单管理 POST /base/whitelistManagement */
+export async function postBaseWhitelistManagement(params:API.AddWhitelistManagementDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/base/whitelistManagement', data:params},{errorMessageMode:mode});}
+/** 修改白名单管理 PUT /base/whitelistManagement */
+export async function putBaseWhitelistManagement(params:API.UpdateWhitelistManagementDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
+        ({url: '/base/whitelistManagement', data:params},{errorMessageMode:mode});}
+/** 删除白名单管理 DELETE /base/whitelistManagement */
+export async function deleteBaseWhitelistManagement(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
+        ({url: '/base/whitelistManagement', data:params},{errorMessageMode:mode});}
+/** 导入 POST /base/whitelistManagement/import */
+export async function postWhitelistManagementImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
+        ({url: '/base/whitelistManagement/import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}
+/** 根据id查询白名单管理信息 GET /base/whitelistManagement/info */
+export async function getWhitelistManagementInfo(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.WhitelistManagementVo>
+        ({url: '/base/whitelistManagement/info', params:params},{errorMessageMode:mode});}
+/** 白名单管理列表(分页) GET /base/whitelistManagement/page */
+export async function getWhitelistManagementPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.WhitelistManagementPageVo>>
+        ({url: '/base/whitelistManagement/page', params:params},{errorMessageMode:mode});}
+/** 获取年级班级树结构 GET /base/whitelistManagement/structure */
+export async function getWhitelistManagementStructure(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.undefined>
+        ({url: '/base/whitelistManagement/structure', params:params},{errorMessageMode:mode});}
+            

src/services/apis/index.ts

@@ -18,6 +18,7 @@ import * as StudentAttendanceRecordController from './StudentAttendanceRecordCon
 import * as TeacherAttendanceRecordController from './TeacherAttendanceRecordController';
 import * as DataAuthController from './DataAuthController';
 import * as BaseClassCourseController from './BaseClassCourseController';
+import * as WhitelistManagementController from './WhitelistManagementController';
 import * as BaseClassController from './BaseClassController';
 import * as ClassroomController from './ClassroomController';
 import * as ConcatController from './ConcatController';
@@ -222,6 +223,8 @@ TeacherAttendanceRecordController,
 DataAuthController,
 /** Base Class Course Controller */
 BaseClassCourseController,
+/** Whitelist Management Controller */
+WhitelistManagementController,
 /** Base Class Controller */
 BaseClassController,
 /** Classroom Controller */

src/services/typing.d.ts

@@ -3444,6 +3444,17 @@ wfTextbookSubscriptionId?: string;
 wfTextbookSubscriptionItemId?: string;
 }
 
+type AddWhitelistManagementDto = {
+/** 身份证 */
+credentialNumber?: string;
+/** 姓名 */
+name?: string;
+/** 手机号 */
+phone?: string;
+/** 用户id */
+userId?: string;
+}
+
 type AddWorkflowSchemaDraftDto = {
 childNodeConfig?: Map<string,object>[];
 processConfig?: ProcessConfig;
@@ -10972,6 +10983,14 @@ total?: number;
 totalPage?: number;
 }
 
+type PageOutput<WhitelistManagementPageVo> = {
+currentPage?: number;
+list?: WhitelistManagementPageVo[];
+pageSize?: number;
+total?: number;
+totalPage?: number;
+}
+
 type PageOutput<XjrLiteflowChainPageVo> = {
 currentPage?: number;
 list?: XjrLiteflowChainPageVo[];
@@ -14386,6 +14405,12 @@ taskId?: string;
 userId?: string;
 }
 
+type TreeNode = {
+children?: TreeNode[];
+id?: string;
+name?: string;
+}
+
 type TwoQuestionVo = {
 /** 数量 */
 count?: number;
@@ -17720,6 +17745,19 @@ wfTextbookSubscriptionId?: string;
 wfTextbookSubscriptionItemId?: string;
 }
 
+type UpdateWhitelistManagementDto = {
+/** 身份证 */
+credentialNumber?: string;
+/** 主键编号 */
+id?: string;
+/** 姓名 */
+name?: string;
+/** 手机号 */
+phone?: string;
+/** 用户id */
+userId?: string;
+}
+
 type UpdateWorkflowSchemaDto = {
 childNodeConfig?: Map<string,object>[];
 id?: string;
@@ -18943,6 +18981,50 @@ teacherSubscriptionNumberSum?: number;
 wfTextbookSubscriptionItemList?: WfTextbookSubscriptionItemVo[];
 }
 
+type WhitelistManagementPageVo = {
+/** 班级id */
+classId?: string;
+/** 班级名称 */
+className?: string;
+/** 创建时间 */
+createDate?: string;
+/** 身份证 */
+credentialNumber?: string;
+/** 删除标记 */
+deleteMark?: number;
+/** 有效标志 */
+enabledMark?: number;
+/** 性别 */
+gender?: string;
+/** 主键编号 */
+id?: string;
+/** 修改时间 */
+modifyDate?: string;
+/** 姓名 */
+name?: string;
+/** 手机号 */
+phone?: string;
+/** 就读方式 */
+readWay?: string;
+/** 班主任 */
+teacher?: string;
+/** 用户id */
+userId?: string;
+}
+
+type WhitelistManagementVo = {
+/** 身份证 */
+credentialNumber?: string;
+/** 主键编号 */
+id?: string;
+/** 姓名 */
+name?: string;
+/** 手机号 */
+phone?: string;
+/** 用户id */
+userId?: string;
+}
+
 type WithdrawDto = {
 /** 活动Id */
 activityId?: string;

src/views/educational/whiteList/index.vue

@@ -28,13 +28,15 @@
   import { PageWrapper } from '/@/components/Page';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import ClassTree from '/@/views/educational/class/components/ClassTree.vue';
-  import {
-    getStundentFaceProcessPage,
-    postStundentFaceProcessBatchImport,
-  } from '/@/services/apis/StundentFaceProcessController';
+
   import { useMessage } from '/@/hooks/web/useMessage';
 
   import { useLoading } from '/@/components/Loading';
+  import {
+    deleteBaseWhitelistManagement,
+    getWhitelistManagementPage,
+    postWhitelistManagementImport,
+  } from '/@/services/apis/WhitelistManagementController';
 
   const { createConfirm, createMessage } = useMessage();
 
@@ -43,13 +45,13 @@
   });
 
   const [registerTable, { reload }] = useTable({
-    api: getStundentFaceProcessPage,
+    api: getWhitelistManagementPage,
     title: '白名单登记列表',
     rowKey: 'id',
     columns: [
       {
         title: '学号',
-        dataIndex: 'studentId',
+        dataIndex: 'credentialNumber',
         align: 'left',
       },
       {
@@ -60,7 +62,7 @@
       },
       {
         title: '手机号',
-        dataIndex: 'mobile',
+        dataIndex: 'phone',
         align: 'left',
         width: 120,
       },
@@ -72,19 +74,19 @@
       },
       {
         title: '班级',
-        dataIndex: 'classCn',
+        dataIndex: 'className',
         align: 'left',
         width: 120,
       },
       {
         title: '班主任',
-        dataIndex: 'teacherCn',
+        dataIndex: 'teacher',
         align: 'left',
         width: 100,
       },
       {
         title: '就读方式',
-        dataIndex: 'stduyStatus',
+        dataIndex: 'readWay',
         align: 'left',
         width: 100,
       },
@@ -93,7 +95,7 @@
       labelWidth: 120,
       schemas: [
         {
-          field: 'studentId',
+          field: 'credentialNumber',
           label: '学号',
           component: 'Input',
           colProps: { span: 8 },
@@ -105,13 +107,13 @@
           colProps: { span: 8 },
         },
         {
-          field: 'mobile',
+          field: 'phone',
           label: '手机号',
           component: 'Input',
           colProps: { span: 8 },
         },
         {
-          field: 'stduyStatus',
+          field: 'readWay',
           label: '就读方式',
           component: 'ApiSelect',
           colProps: { span: 8 },
@@ -147,7 +149,7 @@
   const beforeUpload = async (e) => {
     try {
       openFullLoading();
-      await postStundentFaceProcessBatchImport({ file: e });
+      await postWhitelistManagementImport({ file: e });
       closeFullLoading();
       createMessage.success('导入成功');
       reload();
@@ -164,7 +166,7 @@
       content: '是否删除该记录?',
       onOk: async () => {
         try {
-          //   await deleteEvaluationmanagemenEvaluateTemplate([record.id]);
+          await deleteBaseWhitelistManagement([record.id]);
           createMessage.success('删除成功');
           await reload();
         } catch (e) {