课程专业达成度报表修改

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

@@ -65,7 +65,7 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
     public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long professionalId, String cultureProgramName);
 
     /**
-     * 根据培养方案和课程老师id删除报表
+     * 根据培养方案删除报表
      *
      * @param cultureProgramId
      * @return
@@ -73,7 +73,7 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
     public boolean removeReport(Long cultureProgramId);
 
     /**
-     * 根据培养方案和课程老师id查询报表
+     * 根据培养方案查询报表
      *
      * @param cultureProgramId
      * @return

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

@@ -235,7 +235,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
     }
 
     /**
-     * 根据培养方案和课程老师id删除报表
+     * 根据培养方案删除报表
      *
      * @param cultureProgramId
      * @return
@@ -248,7 +248,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
     }
 
     /**
-     * 根据培养方案和课程老师id查询报表
+     * 根据培养方案查询报表
      *
      * @param cultureProgramId
      * @return

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

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.obe.CourseRequirementMatrixDto;
@@ -105,18 +106,23 @@ public class ObeReportController {
     @RequestMapping(value = "/requirements/detail/report", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "毕业要求达成度详情报表", response = ScoreResult.class)})
     public Result requirementsDetailReport(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId) {
-        List<CourseRequirementMatrixDto> courseRequirementMatrixDtoList = obeCourseRequirementMatrixService.getMatrix(cultureProgramId);
+        ObeCourseRequirementReport obeCourseRequirementReport = obeCourseRequirementReportService.findByCultureProgramId(cultureProgramId);
         List<ObeCourseRequirementDto> obeCourseRequirementDtoList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(courseRequirementMatrixDtoList)) {
-            log.info("courseRequirementMatrixDto:{}", JacksonUtil.parseJson(courseRequirementMatrixDtoList));
-            Long examId = 510450135071723520L;
-//            Long obeCourseOutlineId = 534315681714274304L;
-            List<ObeCourseOutline> obeCourseOutlineList = obeCourseOutlineService.findByCultureProgramId(cultureProgramId);
-            if (!CollectionUtils.isEmpty(obeCourseOutlineList)) {
-                Map<Long, List<ObeSubRequirementsDto>> obeSubRequirementsDtoMap = new LinkedHashMap<>();
-                for (ObeCourseOutline obeCourseOutline : obeCourseOutlineList) {
-                    obeCourseRequirementReportService.matrixCourseReportInfo(courseRequirementMatrixDtoList, obeCourseOutline.getId(),
-                            examId, obeCourseRequirementDtoList, obeSubRequirementsDtoMap);
+        if (Objects.nonNull(obeCourseRequirementReport) && Objects.nonNull(obeCourseRequirementReport.getRequirementDetail())) {
+            obeCourseRequirementDtoList = JSONArray.parseArray(obeCourseRequirementReport.getRequirementDetail(), ObeCourseRequirementDto.class);
+        } else {
+            List<CourseRequirementMatrixDto> courseRequirementMatrixDtoList = obeCourseRequirementMatrixService.getMatrix(cultureProgramId);
+            if (!CollectionUtils.isEmpty(courseRequirementMatrixDtoList)) {
+                log.info("courseRequirementMatrixDto:{}", JacksonUtil.parseJson(courseRequirementMatrixDtoList));
+                Long examId = 510450135071723520L;
+//                Long obeCourseOutlineId = 534315681714274304L;
+                List<ObeCourseOutline> obeCourseOutlineList = obeCourseOutlineService.findByCultureProgramId(cultureProgramId);
+                if (!CollectionUtils.isEmpty(obeCourseOutlineList)) {
+                    Map<Long, List<ObeSubRequirementsDto>> obeSubRequirementsDtoMap = new LinkedHashMap<>();
+                    for (ObeCourseOutline obeCourseOutline : obeCourseOutlineList) {
+                        obeCourseRequirementReportService.matrixCourseReportInfo(courseRequirementMatrixDtoList, obeCourseOutline.getId(),
+                                examId, obeCourseRequirementDtoList, obeSubRequirementsDtoMap);
+                    }
                 }
             }
         }