fix: change basicData classLessons

Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change canteenEvaluation template"
+	git commit --no-verify -m "fix: change basicData classLessons"
 
 checkPre:
 	git checkout pre

src/services/apis/BaseClassCourseController.ts

@@ -22,9 +22,9 @@ export async function putBaseBaseClassCourse(params:API.UpdateBaseClassCourseDto
 /** 删除班级课程 DELETE /base/baseClassCourse */
 export async function deleteBaseBaseClassCourse(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
         ({url: '/base/baseClassCourse', data:params},{errorMessageMode:mode});}
-/** 导出 GET /base/baseClassCourse/export */
-export async function getBaseClassCourseExport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<any>
-        ({url: '/base/baseClassCourse/export',responseType:'blob', params:params},{errorMessageMode:mode});}
+/** 班级课程教材详情条件导出 GET /base/baseClassCourse/class-course-textbook-export-query */
+export async function getBaseClassCourseClassCourseTextbookExportQuery(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/base/baseClassCourse/class-course-textbook-export-query',responseType:'blob',method:'POST', params:params},{errorMessageMode:mode});}
 /** 获取所有课程教材 GET /base/baseClassCourse/getAllCoursesAndTextbooks */
 export async function getBaseClassCourseGetAllCoursesAndTextbooks(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.CourseBookInfo[]>
         ({url: '/base/baseClassCourse/getAllCoursesAndTextbooks', params:params},{errorMessageMode:mode});}

src/services/apis/TextbookSubscriptionController.ts

@@ -54,7 +54,7 @@ export async function postTextbookSubscriptionInstockroomExcelImport(params:any,
 /** 教材教辅征订入库用页面 GET /textbook/textbookSubscription/instockroom-list */
 export async function getTextbookSubscriptionInstockroomList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookInstockroomListVo[]>
         ({url: '/textbook/textbookSubscription/instockroom-list', params:params},{errorMessageMode:mode});}
-/** 确认教材页面使用教材征订明细(不分页) GET /textbook/textbookSubscription/item-list-confirm-distribute */
+/** 教材确认发放页面使用教材征订明细(不分页) GET /textbook/textbookSubscription/item-list-confirm-distribute */
 export async function getTextbookSubscriptionItemListConfirmDistribute(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.SubscriptionItemListDistributeVo[]>
         ({url: '/textbook/textbookSubscription/item-list-confirm-distribute', params:params},{errorMessageMode:mode});}
 /** 教材教辅征订明细列表(分页) GET /textbook/textbookSubscription/item-page */
@@ -66,4 +66,7 @@ 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});}
+/** 教材征订条件导出 GET /textbook/textbookSubscription/textbook-subscription-export-query */
+export async function getTextbookSubscriptionTextbookSubscriptionExportQuery(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/textbook/textbookSubscription/textbook-subscription-export-query',responseType:'blob',method:'POST', params:params},{errorMessageMode:mode});}
             

src/services/typing.d.ts

@@ -5495,10 +5495,14 @@ textbookIdCn?: string;
 }
 
 type BaseClassCoursePageVo = {
+/** 总定价 */
+amount?: number;
 /** 班级id(base_class) */
 classId?: string;
 /** 班级名称 */
 className?: string;
+/** 总小计 */
+count?: number;
 /** 课程id(base_course_subject) */
 courseId?: string;
 /** 教学课程 */
@@ -5508,8 +5512,6 @@ deptName?: string;
 id?: string;
 /** 专业方向 */
 majorName?: string;
-/** 学期 */
-semester?: string;
 /** 教师名称 */
 teacherName?: string;
 /** 教材id(textbook) */
@@ -12704,6 +12706,8 @@ size?: number;
 startDate?: string;
 /** 学生学号 */
 studentId?: string;
+/** 班主任id */
+teacherId?: string;
 }
 
 /** 分页入参 */
@@ -17570,12 +17574,14 @@ textbookType?: string;
 }
 
 type TextbookClaimItem = {
-/** 本次发放数量 */
-confirmNumber?: number;
+/** 本次发放本书总数量 */
+confirmTotalNumber?: number;
 /** 教材申领项主键编号 */
 textbookClaimItemId?: string;
+/** 教材主键编号 */
+textbookId?: string;
 /** 教材征订项主键编号 */
-textbookSubscriptionItemId?: string;
+textbookSubscriptionItems?: TextbookSubscriptionItems[];
 }
 
 type TextbookClaimStudentConfirmVo = {
@@ -18017,7 +18023,7 @@ textbookType?: string;
 
 type TextbookSubscriptionExportQueryListDto = {
 /** 教材教辅征订编号 */
-wfTextbookSubscriptionId?: string;
+textbookSubscriptionId?: string;
 }
 
 type TextbookSubscriptionHistoryListVo = {
@@ -18121,6 +18127,13 @@ useType?: number;
 version?: string;
 }
 
+type TextbookSubscriptionItems = {
+/** 本次发放本书本征订记录中的数量 */
+confirmNumber?: number;
+/** 教材征订项主键编号 */
+textbookSubscriptionItemId?: string;
+}
+
 type TextbookSubscriptionListVo = {
 /** 书名 */
 bookName?: string;

src/views/educational/classLessons/index.vue

@@ -11,7 +11,7 @@
   import { useModal } from '/@/components/Modal';
   import View from './components/view.vue';
   import {
-    getBaseClassCourseExport,
+    getBaseClassCourseClassCourseTextbookExportQuery,
     getBaseClassCoursePage,
   } from '/@/services/apis/BaseClassCourseController';
   import { downloadFileByBlob } from '/@/utils/file/download';
@@ -24,7 +24,7 @@
   const selectedRow = ref<any>([]);
   const selectedRowKey = ref<any>([]);
   const selectId = ref('');
-  const [tableRef, { reload }] = useTable({
+  const [tableRef, { reload, getForm }] = useTable({
     title: '班级课程记录表',
     columns: tableColumns,
     api: getBaseClassCoursePage,
@@ -80,10 +80,14 @@
   };
 
   const handleExport = async () => {
+    const postData = getForm().getFieldsValue();
     try {
       await downloadFileByBlob(
         (
-          await getBaseClassCourseExport({})
+          await getBaseClassCourseClassCourseTextbookExportQuery({
+            ...postData,
+            semester: selectId.value,
+          })
         ).data,
         `班级课程记录表${new Date().toLocaleDateString().replace(/\//g, '-')}.xlsx`,
       );
@@ -105,11 +109,12 @@
           type="primary"
           @click="handleEdit(false, null)"
           :disabled="!selectId || !selectedRow.length"
-          >批量设置</a-button
-        >
-        <a-button type="primary" class="ml-[12px]" :disabled="!selectId" @click="handleCopy"
-          >复用课程</a-button
         >
+          批量设置
+        </a-button>
+        <a-button type="primary" class="ml-[12px]" :disabled="!selectId" @click="handleCopy">
+          复用课程
+        </a-button>
         <a-button type="primary" class="ml-[12px]" @click="handleImport">导入</a-button>
         <a-button type="primary" class="ml-[12px]" @click="handleExport">导出</a-button>
       </template>