课程专业达成度雷达报表

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

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
-import com.qmth.distributed.print.business.entity.TCFinalScore;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -24,7 +23,9 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      * @param iPage
      * @param cultureProgramId
      * @param obeCourseOutlineId
+     * @param professionalId
+     * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("obeCourseOutlineId") Long obeCourseOutlineId);
+    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("obeCourseOutlineId") Long obeCourseOutlineId, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
 }

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

@@ -57,9 +57,11 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
      * @param iPage
      * @param cultureProgramId
      * @param obeCourseOutlineId
+     * @param professionalId
+     * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long obeCourseOutlineId);
+    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long obeCourseOutlineId, Long professionalId, String cultureProgramName);
 
     /**
      * 根据培养方案和课程老师id删除报表

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

@@ -207,11 +207,13 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      * @param iPage
      * @param cultureProgramId
      * @param obeCourseOutlineId
+     * @param professionalId
+     * @param cultureProgramName
      * @return
      */
     @Override
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long obeCourseOutlineId) {
-        return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, obeCourseOutlineId);
+    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long obeCourseOutlineId, Long professionalId, String cultureProgramName) {
+        return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, obeCourseOutlineId, professionalId, cultureProgramName);
     }
 
     /**

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

@@ -4,6 +4,7 @@
 
     <select id="obeCourseRequirementReportList" resultType="com.qmth.distributed.print.business.entity.ObeCourseRequirementReport">
         select t.* from obe_course_requirement_report t
+        join obe_culture_program ocp on ocp.id = t.culture_program_id
         <where>
             <if test="cultureProgramId != null and cultureProgramId != ''">
                 and t.culture_program_id = #{cultureProgramId}
@@ -11,6 +12,12 @@
             <if test="obeCourseOutlineId != null and obeCourseOutlineId != ''">
                 and t.obe_course_outline_id = #{obeCourseOutlineId}
             </if>
+            <if test="professionalId != null and professionalId != ''">
+                and ocp.professional_id = #{professionalId}
+            </if>
+            <if test="cultureProgramName != null and cultureProgramName != ''">
+                and ocp.name like concat('%',#{cultureProgramName},'%')
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -2,7 +2,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.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.obe.CourseRequirementMatrixDto;
 import com.qmth.distributed.print.business.bean.dto.report.ObeCourseRequirementDto;
@@ -54,9 +53,11 @@ public class ObeReportController {
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ObeCourseRequirementReport.class)})
     public Result requirementsList(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
                                    @ApiParam(value = "课程大纲ID", required = true) @RequestParam Long obeCourseOutlineId,
+                                   @ApiParam(value = "专业ID") @RequestParam(required = false) 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, obeCourseOutlineId));
+        return ResultUtil.ok(obeCourseRequirementReportService.obeCourseRequirementReportList(new Page<>(pageNumber, pageSize), cultureProgramId, obeCourseOutlineId, professionalId, cultureProgramName));
     }
 
     @ApiOperation(value = "毕业要求达成度雷达报表")