提示修改

distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCPaperStructController.java

@@ -156,7 +156,7 @@ public class TCPaperStructController {
         tcFinalScoreService.getLock(paperStructParams.getCultureProgramId(), paperStructParams.getCourseId(), paperStructParams.getPaperNumber());
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(paperStructParams.getCultureProgramId(), paperStructParams.getCourseId());
 
-        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
         for (CourseWeightDto c : obeCourseWeightResult.getSubmitForm()) {
             for (PaperStructDimensionResult paperStructDimensionResult : paperStructParams.getPaperStruct()) {
                 Objects.requireNonNull(paperStructDimensionResult.getMainNumber(), "大题号为空");
@@ -217,7 +217,7 @@ public class TCPaperStructController {
                 paperStructDimensionResultList.add(new PaperStructDimensionResult(markQuestion.getMainNumber(), markQuestion.getSubNumber(), examId, markQuestion.getPaperNumber(), new BigDecimal(markQuestion.getTotalScore())));
             }
         } else {
-            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
             if (Objects.nonNull(tcPaperStruct.getDimensionSign()) && tcPaperStruct.getDimensionSign().longValue() != obeCourseWeightResult.getDimensionSign().longValue()) {
                 trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber, false);
                 paperStructDimensionResultList = this.getPaperStructDimensionResult(tcPaperStruct, paperStructDimensionResultList);

distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCUsualScoreController.java

@@ -92,7 +92,7 @@ public class TCUsualScoreController {
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(
                 cultureProgramId, courseId);
 
-        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
         List<CourseWeightDto> courseWeightDtoList = obeCourseWeightResult.getSubmitForm();
 
         List<ExcelField> excelFieldList = new ArrayList<>();

distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -139,7 +139,7 @@ public class TRBasicInfoController {
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(cultureProgramId,
                 courseId);
 
-        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+        ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
         log.info("ObeCourseWeightResult:{}", JacksonUtil.parseJson(obeCourseWeightResult));
         TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(cultureProgramId, courseId, paperNumber);
         if (Objects.isNull(tcPaperStruct) || Objects.isNull(tcPaperStruct.getPaperStructDimension())) {
@@ -209,7 +209,7 @@ public class TRBasicInfoController {
             ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(cultureProgramId,
                     courseId);
 
-            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
             log.info("ObeCourseWeightResult:{}", JacksonUtil.parseJson(obeCourseWeightResult));
             TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(cultureProgramId, courseId, paperNumber);
             if (Objects.isNull(tcPaperStruct) || Objects.isNull(tcPaperStruct.getPaperStructDimension())) {
@@ -257,7 +257,7 @@ public class TRBasicInfoController {
         try {
             trBasicInfoDb = trBasicInfoService.queryBasicInfo(trBasicInfo.getCultureProgramId(), trBasicInfo.getCourseId(), trBasicInfo.getPaperNumber());
             ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(trBasicInfo.getCultureProgramId(), trBasicInfo.getCourseId());
-            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
             TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(trBasicInfo.getCultureProgramId(), trBasicInfo.getCourseId(), trBasicInfo.getPaperNumber());
             MarkPaper markPaper = printCommonService.getMarkPaper(trBasicInfo.getExamId(), Objects.nonNull(tcPaperStruct) ? tcPaperStruct.getPaperNumber() : trBasicInfo.getPaperNumber(), trBasicInfo.getCourseId());
             if (Objects.isNull(trBasicInfoDb)) {
@@ -301,7 +301,7 @@ public class TRBasicInfoController {
             Objects.requireNonNull(trBasicInfo.getCourseEvaluationResult(), "未设置课程目标，报告生成失败，请在课程大纲管理菜单设置课程目标");
             Objects.requireNonNull(trBasicInfo.getCourseEvaluationResultDetail(), "没有课程考生信息");
 
-            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
             TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(cultureProgramId, courseId, paperNumber);
             if (Objects.nonNull(tcPaperStruct) && Objects.nonNull(tcPaperStruct.getPaperStructDimension())) {
                 List<PaperStructDimensionResult> paperStructDimensionResultList = GsonUtil.fromJson(tcPaperStruct.getPaperStructDimension(), new TypeToken<List<PaperStructDimensionResult>>() {

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/TRBasicInfoService.java

@@ -143,9 +143,10 @@ public interface TRBasicInfoService extends IService<TRBasicInfo> {
      * 查找课程评价值
      *
      * @param obeCourseOutlineId
+     * @param vaildWeight
      * @return
      */
-    public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId);
+    public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId, boolean vaildWeight);
 
     /**
      * 查找课程评价值

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

@@ -163,7 +163,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
                                                       Map<Long, List<ObeSubRequirementsDto>> obeSubRequirementsDtoMap) {
         Map<String, Object> resultMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(courseRequirementMatrixDtoList)) {
-            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutlineId);
+            ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutlineId, false);
             log.info("obeCourseWeightResult:{}", JacksonUtil.parseJson(obeCourseWeightResult));
 
             List<CourseWeightDto> courseWeightDtoList = obeCourseWeightResult.getSubmitForm();

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

@@ -253,7 +253,7 @@ public class TCPaperStructServiceImpl extends ServiceImpl<TCPaperStructMapper, T
             } else {
                 tcPaperStructService.remove(cultureProgramId, courseId, paperNumber);
                 MarkPaper markPaper = printCommonService.getMarkPaper(examId, paperNumber, courseId);
-                ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
+                ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);
                 paperStructDimensionResultList = SDFrame.read(paperStructDimensionResultList).sortDesc(Sorter.sortDescBy(PaperStructDimensionResult::getMainNumber).sortDesc(PaperStructDimensionResult::getMainNumber)).toLists();
                 tcPaperStruct = new TCPaperStruct(examId, cultureProgramId, courseId, markPaper.getCourseCode(), markPaper.getCourseName(), paperNumber, JacksonUtil.parseJson(paperStructDimensionResultList), sysUser.getId(), obeCourseWeightResult.getDimensionSign());
                 List<MarkQuestion> markQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndPaperType(examId, paperNumber, null);

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

@@ -1046,10 +1046,11 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
      * 查找课程评价值
      *
      * @param obeCourseOutlineId
+     * @param vaildWeight
      * @return
      */
     @Override
-    public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId) {
+    public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId, boolean vaildWeight) {
         ObeCourseWeightResult obeCourseWeightResult = obeCourseWeightService.findCourseWeight(obeCourseOutlineId);
         Objects.requireNonNull(obeCourseWeightResult, "未设置课程目标，报告生成失败，请在课程大纲管理菜单设置课程目标");
 //        Objects.requireNonNull(obeCourseWeightResult.getWeightSettingSign(), "课程权重变化id为空");
@@ -1058,8 +1059,10 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         if (CollectionUtils.isEmpty(courseWeightDtoList)) {
             throw ExceptionResultEnum.ERROR.exception("未设置课程目标，报告生成失败，请在课程大纲管理菜单设置课程目标");
         }
-        for (CourseWeightDto c : obeCourseWeightResult.getSubmitForm()) {
-            Objects.requireNonNull(c.getTotalWeight(), "[" + c.getCourseTargetName() + "]未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
+        if (vaildWeight) {
+            for (CourseWeightDto c : obeCourseWeightResult.getSubmitForm()) {
+                Objects.requireNonNull(c.getTotalWeight(), "[" + c.getCourseTargetName() + "]未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
+            }
         }
 
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.getById(obeCourseOutlineId);