Merge branch 'pre'

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -809,7 +809,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                         .select(XjrUser::getId)
                         .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                         .innerJoin(BaseClass.class, BaseClass::getTeacherId, XjrUser::getId)
-                        .innerJoin(AssessmentPlanAnswerClass.class, AssessmentPlanAnswerClass::getClassId, XjrUser::getId)
+                        .innerJoin(AssessmentPlanAnswerClass.class, AssessmentPlanAnswerClass::getClassId, BaseClass::getId)
                         .eq(AssessmentPlanAnswerClass::getAssessmentTemplatePlanId, templatePlan.getId())
                         .eq(AssessmentPlanAnswerClass::getDeleteMark, DeleteMark.NODELETE.getCode())
         );

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -303,12 +303,12 @@ public class BaseClassCourseController {
         return RT.ok(result);
     }
 
-//    @PostMapping("/class-course-textbook-export-query")
-//    @ApiOperation(value = "班级课程教材详情条件导出")
-//    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid @RequestBody ClassCourseTextbookExportQueryDto dto) throws IOException {
-    @GetMapping("/class-course-textbook-export-query")
+    @PostMapping("/class-course-textbook-export-query")
     @ApiOperation(value = "班级课程教材详情条件导出")
-    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid ClassCourseTextbookExportQueryDto dto) throws IOException {
+    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid @RequestBody ClassCourseTextbookExportQueryDto dto) throws IOException {
+//    @GetMapping("/class-course-textbook-export-query")
+//    @ApiOperation(value = "班级课程教材详情条件导出")
+//    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid ClassCourseTextbookExportQueryDto dto) throws IOException {
         ByteArrayOutputStream bot = baseClassCourseService.classCourseTextbookExportQuery(dto);
         return RT.fileStream(bot.toByteArray(), "BaseClassCourse" + ExcelTypeEnum.XLSX.getValue());
     }

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassCourseServiceImpl.java

@@ -268,7 +268,7 @@ public class BaseClassCourseServiceImpl extends MPJBaseServiceImpl<BaseClassCour
                 baseClassCourseLambdaUpdateWrapper
                         .eq(BaseClassCourse::getBaseSemesterId, dto.getBaseSemesterId())
                         .eq(BaseClassCourse::getClassId, classId)
-                        .eq(BaseClassCourse::getCourseId, classId)
+                        .eq(BaseClassCourse::getCourseId, courseId)
                         .eq(BaseClassCourse::getTextbookId, textbookId)
                         ;
                 this.remove(baseClassCourseLambdaUpdateWrapper);