3.4.0 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -337,10 +337,10 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                 exampleStyleDf.setDataFormat(formatDf.getFormat("yyyy-mm-dd"));
                 exampleStyleDf.setAlignment(HorizontalAlignment.LEFT);
                 exampleStyleDf.setFont(defaultFont);
-                cell.setCellValue("2023-07-09");
+                cell.setCellValue("2023-01-01");
                 cell.setCellStyle(exampleStyleDf);
             } else if ("examTime".equals(fieldsDto.getCode())) {
-                cell.setCellValue("18:30-20:30");
+                cell.setCellValue("10:00-12:00");
                 cell.setCellStyle(exampleStyle);
             } else {
                 cell.setCellValue("测试" + fieldsNameList.get(i).getName());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1885,6 +1885,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     examStudent.setSchoolId(schoolId);
                     examStudent.setExamId(examTask.getExamId());
                     examStudent.setBasicStudentId(basicExamStudent.getId());
+                    examStudent.setStudentCode(basicExamStudent.getStudentCode());
                     examStudent.setExamDetailCourseId(examDetailCourse.getId());
                     examStudent.setPaperNumber(paperNumber);
                     examStudent.setCoursePaperId(examDetailCourse.getCoursePaperId());

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -321,3 +321,4 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1182', '客观题统分', '/api/admin/mark/student/objective/calculate_batch', 'URL', '946', '13', 'AUTH', '1', '1', '1');
 
 ALTER TABLE `basic_school` ADD COLUMN `exam_task_instr` VARCHAR(500) NULL COMMENT '广药命题界面提示信息' AFTER `background_image`;
+ALTER TABLE `mark_track` ADD INDEX `index4` (`task_id` ASC) ;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -461,21 +461,21 @@ public class SystemConstant {
             "6、【试卷编号】必填,且与命题任务中的试卷编号相互对应；\n" +
             "7、【考点】必填；\n" +
             "8、【考场】必填；\n" +
-            "9、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-07-09；\n" +
-            "10、【考试时间】必填,且格式为HH:mm-HH:mm。例如18:30-20:30；\n" +
+            "9、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-01-01；\n" +
+            "10、【考试时间】必填,且格式为HH:mm-HH:mm。例如10:00-12:00；\n" +
             "11、请不要删除此行，也不要删除模板中的任何列。\n" +
             "12、使用前请先删除样例数据。\n";
 
     public static final String BASIC_EXAM_STUDENT_DESCRIBE = "说明\n" + "1、课程名称、课程代码、姓名、学号、教学班均必填；\n"
-            + "2、试卷编号存在时，任课老师、任课老师工号、考试日期、考试时间、考点（校区）、考场（考试教师）均必填\n" + "3、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-07-09；\n"
-            + "4、【考试时间】必填,且格式为HH:mm-HH:mm。例如18:30-20:30；\n" + "5、请不要删除此行，也不要删除模板中的任何列。\n" + "6、使用前请先删除样例数据。";
+            + "2、试卷编号存在时，任课老师、任课老师工号、考试日期、考试时间、考点（校区）、考场（考试教师）均必填\n" + "3、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-01-01；\n"
+            + "4、【考试时间】必填,且格式为HH:mm-HH:mm。例如10:00-12:00；\n" + "5、请不要删除此行，也不要删除模板中的任何列。\n" + "6、使用前请先删除样例数据。";
 
     public static final String MARK_STUDENT_DESCRIBE = "说明\n" +
             "1、课程名称、课程编号、试卷编号、姓名、学号均必填；\n" +
             "2、学号在课程下唯一；\n" +
             "3、同一个课程、试卷下的班级信息要么全填要么全不填；\n" +
-            "4、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-07-09；\n" +
-            "5、【考试时间】必填,且格式为HH:mm-HH:mm。例如18:30-20:30；\n" +
+            "4、【考试日期】必填,且格式为YYYY-MM-DD。例如2023-01-01；\n" +
+            "5、【考试时间】必填,且格式为HH:mm-HH:mm。10:00-12:00；\n" +
             "6、请不要删除此行，也不要删除模板中的任何列。\n" +
             "7、使用前请先删除样例数据。";
 

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/mapper/TCUsualScoreMapper.java

@@ -23,12 +23,13 @@ public interface TCUsualScoreMapper extends BaseMapper<TCUsualScore> {
      * 成绩管理列表
      *
      * @param iPage
+     * @param schoolId
      * @param cultureProgramId
      * @param courseId
      * @param dpr
      * @return
      */
-    public IPage<ObeScoreResult> scoreList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("semesterId") Long semesterId, @Param("courseId") Long courseId,
+    public IPage<ObeScoreResult> scoreList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("cultureProgramId") Long cultureProgramId, @Param("semesterId") Long semesterId, @Param("courseId") Long courseId,
                                            @Param("dpr") DataPermissionRule dpr);
 
     /**

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TCFinalScoreServiceImpl.java

@@ -479,7 +479,7 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
     public IPage<ObeScoreResult> scoreList(IPage<Map> iPage, Long cultureProgramId, Long semesterId, Long courseId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return tcUsualScoreMapper.scoreList(iPage, cultureProgramId, semesterId, courseId, dpr);
+        return tcUsualScoreMapper.scoreList(iPage, sysUser.getSchoolId(), cultureProgramId, semesterId, courseId, dpr);
     }
 
     /**

teachcloud-obe/src/main/resources/mapper/TCUsualScoreMapper.xml

@@ -27,6 +27,7 @@
         LEFT JOIN
             obe_culture_program ocp ON ocp.id = oco.culture_program_id
         <where>
+            AND oco.school_id = #{schoolId}
             <if test="cultureProgramId != null">
                 AND ocp.id = #{cultureProgramId}
             </if>
@@ -41,7 +42,7 @@
                     AND oco.user_id = #{dpr.requestUserId}
                 </if>
                 <if test="dpr.courseUserId != null">
-                    AND EXISTS( SELECT 1 FROM (select course_code from teach_course where user_id = #{dpr.courseUserId}) tc WHERE tc.course_code = bc.code)
+                    AND EXISTS( SELECT 1 FROM (select course_id from teach_course where user_id = #{dpr.courseUserId}) tc WHERE tc.course_id = bc.id)
                 </if>
                 <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
                     AND bc.teaching_room_id IN