3.3.4 update

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

@@ -62,13 +62,15 @@ public class BasicProfessionalServiceImpl extends ServiceImpl<BasicProfessionalM
     @Override
     public Boolean saveData(BasicProfessional basicProfessional) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
+        BasicProfessional basicProfessional1 = this.getOne(new QueryWrapper<BasicProfessional>().lambda().eq(BasicProfessional::getOrgId, basicProfessional.getOrgId()).eq(BasicProfessional::getName, basicProfessional.getName()));
         if (basicProfessional.getId() == null) {
+            if (basicProfessional1 != null) {
+                throw ExceptionResultEnum.ERROR.exception("专业名称已存在");
+            }
             basicProfessional.insertInfo(sysUser.getId());
             basicProfessional.setSchoolId(sysUser.getSchoolId());
             return this.save(basicProfessional);
         } else {
-            BasicProfessional basicProfessional1 = this.getOne(new QueryWrapper<BasicProfessional>().lambda().eq(BasicProfessional::getOrgId, basicProfessional.getOrgId()).eq(BasicProfessional::getName, basicProfessional.getName()));
             if (basicProfessional1 != null && basicProfessional1.getId().longValue() != basicProfessional.getId().longValue()) {
                 throw ExceptionResultEnum.ERROR.exception("专业名称已存在");
             }

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

@@ -258,7 +258,7 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
                 MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
                 matrixSubRequirementDto.setId(tpMatrix.getObeSubRequirementId());
                 matrixSubRequirementDto.setName(concatRequirementName(tpMatrix.getRequirementSortNum(), tpMatrix.getSubRequirementSortNum()));
-                matrixSubRequirementDto.setScale(new BigDecimal(tpMatrix.getScale()));
+                matrixSubRequirementDto.setScale(tpMatrix.getScale() != null ? new BigDecimal(tpMatrix.getScale()) : null);
                 matrixSubRequirementDto.setContent(tpMatrix.getRequirementContent());
                 return matrixSubRequirementDto;
             }).collect(Collectors.toList());

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -951,7 +951,8 @@ CREATE TABLE IF NOT EXISTS `exam_student` (
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `unique_ticket_number_idx` (`school_id`,`ticket_number`) USING BTREE,
   KEY `exam_student_schoolId_idx` (`school_id`,`student_code`) USING BTREE,
-  KEY `idx_exam_detail_course_id` (`exam_detail_course_id`) USING BTREE
+  KEY `idx_exam_detail_course_id` (`exam_detail_course_id`) USING BTREE,
+  KEY `idx_4` (`exam_id`, `paper_number`, `student_code`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='考生';
 
 -- ----------------------------
@@ -5703,7 +5704,8 @@ CREATE TABLE IF NOT EXISTS `t_r_exam_student` (
   `administrative_class` varchar(100) DEFAULT NULL COMMENT '行政班级',
   `score` double DEFAULT NULL COMMENT '学生成绩',
   `result_detail` mediumtext COMMENT '考生课程考核成绩评价明细结果',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_1` (`r_basic_info_id`,`student_code`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='报告考生表';
 
 -- ----------------------------