Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

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

@@ -83,10 +83,10 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
 
         ObeCourseOutline checkUnique = this.getOne(new QueryWrapper<ObeCourseOutline>().lambda()
                 .eq(ObeCourseOutline::getCultureProgramId, cultureProgramId)
-                .eq(ObeCourseOutline::getName, courseOutlineName).last(SystemConstant.LIMIT1));
+                .eq(ObeCourseOutline::getCourseId, courseId).last(SystemConstant.LIMIT1));
         if (Objects.nonNull(checkUnique)) {
             if (!Objects.equals(checkUnique.getId(), id)) {
-                throw new RuntimeException("该课程大纲名称已存在");
+                throw new RuntimeException("该课程已经创建了课程大纲不能重复创建");
             }
         }
 

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

@@ -22,6 +22,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -198,8 +199,8 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
 
     @Override
     @Transactional
-    public Boolean remove(Long cultureProgramId, Long courseId, String paperNumber) {
-        TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(cultureProgramId,courseId,paperNumber);
+    public Boolean remove(Long obeCultureProgramId, Long courseId, String paperNumber) {
+        TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(obeCultureProgramId, courseId, paperNumber);
         return Objects.nonNull(trBasicInfo) ? trExamStudentService.remove(trBasicInfo.getId()) : false;
     }
 
@@ -263,7 +264,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             StudentTotalRequirement studentTotalRequirement = new StudentTotalRequirement();
             studentTotalRequirement.setRequirementName(keys[1]);
             studentTotalRequirement.setRequirementSortNum(Integer.valueOf(keys[0]));
-            studentTotalRequirement.setStudentDegree(doubleMap.values().stream().min(Double::compare).get());
+            studentTotalRequirement.setStudentDegree(new BigDecimal(doubleMap.values().stream().min(Double::compare).get()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             if (requirementDegreeMap.containsKey(keys[1])) {
                 studentTotalRequirement.setProfessionalDegree(requirementDegreeMap.get(keys[1]).doubleValue());
             }

distributed-print-business/src/main/resources/db/log/caozixuan.sql

@@ -169,3 +169,10 @@ ALTER TABLE t_c_final_score
     ADD UNIQUE INDEX t_c_final_score_unique (culture_program_id ASC, course_id ASC, name ASC, student_code ASC)
 ;
 
+ALTER TABLE obe_course_outline
+    DROP INDEX obe_course_outline_unique ,
+    ADD UNIQUE INDEX obe_course_outline_unique (culture_program_id ASC, course_id ASC) VISIBLE;
+;
+
+UPDATE sys_privilege SET related = '77,842,843,844,845,846,847,848,849,850,851,852,853,866,1115,3018,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1128,1129' WHERE (id = '841');
+