3.3.4 update

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

@@ -175,7 +175,7 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
         }
         AtomicInteger i = new AtomicInteger(1);
         String name = obeCultureProgram.getName() + "副本" + i.getAndIncrement();
-        while (this.getBySchoolIdAndName(obeCultureProgram.getProfessionalId(), name) != null) {
+        while (this.getBySchoolIdAndName(obeCultureProgram.getSchoolId(), name) != null) {
             name = obeCultureProgram.getName() + "副本" + i.getAndIncrement();
         }
         obeCultureProgram.setId(SystemConstant.getDbUuid());

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

@@ -234,6 +234,8 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
                     for (CourseTargetRequirement courseTargetRequirement : studentCourseInfoDto.getCourseTargetRequirementList()) {
                         if (courseTargetRequirement.getSubRequirementId().equals(obeCourseTarget.getObeCultureProgramRequirementId())) {
                             courseTargetRequirement.setCourseTargetDegree(reportExamStudentTargetDto.getMatrixDegree().doubleValue());
+                        } else {
+                            courseTargetRequirement.setCourseTargetDegree(courseTargetRequirement.getCourseTargetDegree() != null ? courseTargetRequirement.getCourseTargetDegree() : 0.0d);
                         }
                     }
                 }
@@ -249,7 +251,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             studentCourseRequirement.setCourseName(studentCourseInfoDto.getCourseName());
             studentCourseRequirement.setSemesterName(studentCourseInfoDto.getSemesterName());
             studentCourseRequirement.setScore(studentCourseInfoDto.getScore());
-            LinkedHashMap<String, Double> map = studentCourseInfoDto.getCourseTargetRequirementList().stream().collect(Collectors.toMap(CourseTargetRequirement::getRequirementName, CourseTargetRequirement::getCourseTargetDegree, (v1, v2) -> v1 == null ? v2 == null ? v2 : v1.doubleValue() <= v2.doubleValue() ? v1 : v2 : v1, LinkedHashMap::new));
+            LinkedHashMap<String, Double> map = studentCourseInfoDto.getCourseTargetRequirementList().stream().collect(Collectors.toMap(CourseTargetRequirement::getRequirementName, CourseTargetRequirement::getCourseTargetDegree, (v1, v2) -> v1 != 0 && v2 != 0 ? v1.doubleValue() <= v2.doubleValue() ? v1 : v2 : v1 == 0 && v2 != 0 ? v2 : v1 != 0 && v2 == 0 ? v1 : null, LinkedHashMap::new));
             List<StudentCourseRequirementDetail> requirementDetailList = map.entrySet().stream().map(entry -> new StudentCourseRequirementDetail(entry.getKey(), entry.getValue())).collect(Collectors.toList());
             studentCourseRequirement.setRequirementDetailList(requirementDetailList);
             studentCourseRequirementList.add(studentCourseRequirement);

distributed-print-business/src/main/resources/mapper/TRExamStudentMapper.xml

@@ -22,7 +22,9 @@
         WHERE
             rbi.culture_program_id = #{cultureProgramId}
           AND res.student_code = #{studentCode}
-          AND bs.id = #{semesterId}
+          <if test="semesterId != null">
+              AND bs.id = #{semesterId}
+          </if>
     </select>
     <select id="requirementStudentPage"
             resultType="com.qmth.distributed.print.business.bean.dto.report.StudentRequirementInfoDto">

distributed-print/src/main/java/com/qmth/distributed/print/api/ObeReportController.java

@@ -115,8 +115,8 @@ public class ObeReportController {
     @ApiOperation(value = "毕业要求达成度学生报表-列表")
     @RequestMapping(value = "/student_requirement/page", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "毕业要求达成度学生报表", response = ScoreResult.class)})
-    public Result requirementsStudentPage(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
-                                          @ApiParam(value = "学号/姓名", required = true) @RequestParam String studentCodeOrName,
+    public Result requirementsStudentPage(@ApiParam(value = "培养方案ID") @RequestParam(required = false) Long cultureProgramId,
+                                          @ApiParam(value = "学号/姓名") @RequestParam(required = false) String studentCodeOrName,
                                           @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                           @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(trExamStudentService.getRequirementsStudentPage(cultureProgramId, studentCodeOrName, pageNumber, pageSize));
@@ -127,7 +127,7 @@ public class ObeReportController {
     @ApiResponses({@ApiResponse(code = 200, message = "毕业要求达成度学生报表", response = ScoreResult.class)})
     public Result requirementsStudentReport(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
                                             @ApiParam(value = "学号", required = true) @RequestParam String studentCode,
-                                            @ApiParam(value = "学期", required = true) @RequestParam Long semesterId) {
+                                            @ApiParam(value = "学期") @RequestParam(required = false) Long semesterId) {
         return ResultUtil.ok(trExamStudentService.getRequirementsStudentReport(cultureProgramId, studentCode, semesterId));
     }
 }