课程专业达成度报表修改

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

@@ -34,7 +34,7 @@ public interface ObeCourseOutlineService extends IService<ObeCourseOutline> {
      * @return 分页数据
      */
     IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(Long professionalId, Long cultureProgramId, Long courseId,
-            String courseOutlineName, int pageNumber, int pageSize);
+                                                           String courseOutlineName, int pageNumber, int pageSize);
 
     /**
      * 课程大纲保存
@@ -95,4 +95,12 @@ public interface ObeCourseOutlineService extends IService<ObeCourseOutline> {
      * @return 课程
      */
     List<DictionaryResult> findCanChooseCourse(Long cultureProgramId);
+
+    /**
+     * 根据培养方案id查找课程大纲
+     *
+     * @param cultureProgramId
+     * @return
+     */
+    List<ObeCourseOutline> findByCultureProgramId(Long cultureProgramId);
 }

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

@@ -30,7 +30,9 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
      * @return
      */
     public Map<String, Object> matrixCourseReportInfo(List<CourseRequirementMatrixDto> courseRequirementMatrixDtoList,
-                                                      Long obeCourseOutlineId, Long examId);
+                                                      Long obeCourseOutlineId, Long examId,
+                                                      List<ObeCourseRequirementDto> obeCourseRequirementDtoList,
+                                                      Map<Long, List<ObeSubRequirementsDto>> obeSubRequirementsDtoMap);
 
     /**
      * 换算课程毕业达成度报表

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

@@ -61,7 +61,7 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
 
     @Override
     public IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(Long professionalId, Long cultureProgramId, Long courseId,
-            String courseOutlineName, int pageNumber, int pageSize) {
+                                                                  String courseOutlineName, int pageNumber, int pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         courseOutlineName = SystemConstant.translateSpecificSign(courseOutlineName);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
@@ -219,4 +219,15 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
     public List<DictionaryResult> findCanChooseCourse(Long cultureProgramId) {
         return this.baseMapper.findCanChooseCourse(cultureProgramId);
     }
+
+    /**
+     * 根据培养方案id查找课程大纲
+     *
+     * @param cultureProgramId
+     * @return
+     */
+    @Override
+    public List<ObeCourseOutline> findByCultureProgramId(Long cultureProgramId) {
+        return this.list(new QueryWrapper<ObeCourseOutline>().lambda().eq(ObeCourseOutline::getCultureProgramId, cultureProgramId));
+    }
 }