课程专业达成度报表列表

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ObeCourseRequirementReportMapper.java

@@ -22,10 +22,9 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      * 查找课程毕业达成度报表列表
      *
      * @param iPage
-     * @param cultureProgramId
      * @param professionalId
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
 }

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

@@ -56,12 +56,11 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
      * 查找课程毕业达成度报表列表
      *
      * @param iPage
-     * @param cultureProgramId
      * @param professionalId
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long professionalId, String cultureProgramName);
 
     /**
      * 根据培养方案和课程老师id删除报表

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

@@ -206,14 +206,13 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      * 查找课程毕业达成度报表列表
      *
      * @param iPage
-     * @param cultureProgramId
      * @param professionalId
      * @param cultureProgramName
      * @return
      */
     @Override
-    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName) {
-        return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, professionalId, cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long professionalId, String cultureProgramName) {
+        return this.baseMapper.obeCourseRequirementReportList(iPage, professionalId, cultureProgramName);
     }
 
     /**

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

@@ -12,9 +12,6 @@
         left join obe_culture_program ocp on ocp.id = t.culture_program_id
         left join basic_professional bp on bp.id = ocp.professional_id
         <where>
-            <if test="cultureProgramId != null and cultureProgramId != ''">
-                and t.culture_program_id = #{cultureProgramId}
-            </if>
             <if test="professionalId != null and professionalId != ''">
                 and ocp.professional_id = #{professionalId}
             </if>

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

@@ -55,12 +55,11 @@ public class ObeReportController {
     @ApiOperation(value = "毕业要求达成度报表列表")
     @RequestMapping(value = "/requirements/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ObeCourseRequirementListResult.class)})
-    public Result requirementsList(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
-                                   @ApiParam(value = "专业ID") @RequestParam(required = false) Long professionalId,
+    public Result requirementsList(@ApiParam(value = "专业ID", required = true) @RequestParam Long professionalId,
                                    @ApiParam(value = "培养方案名称") @RequestParam(required = false) String cultureProgramName,
                                    @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                    @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(obeCourseRequirementReportService.obeCourseRequirementReportList(new Page<>(pageNumber, pageSize), cultureProgramId, professionalId, cultureProgramName));
+        return ResultUtil.ok(obeCourseRequirementReportService.obeCourseRequirementReportList(new Page<>(pageNumber, pageSize), professionalId, cultureProgramName));
     }
 
     @ApiOperation(value = "毕业要求达成度雷达报表")