课程专业达成度雷达报表

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ObeCourseRequirementListResult.java

@@ -0,0 +1,74 @@
+package com.qmth.distributed.print.business.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 毕业达成度列表result
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/6/13
+ */
+public class ObeCourseRequirementListResult implements Serializable {
+
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "培养方案id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long cultureProgramId;
+
+    @ApiModelProperty(value = "培养方案名称")
+    private String obeCultureProgramName;
+
+    @ApiModelProperty(value = "专业名称")
+    private String professionalName;
+
+    @ApiModelProperty(value = "毕业要求达成值")
+    private Double requirementDegree;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCultureProgramId() {
+        return cultureProgramId;
+    }
+
+    public void setCultureProgramId(Long cultureProgramId) {
+        this.cultureProgramId = cultureProgramId;
+    }
+
+    public String getObeCultureProgramName() {
+        return obeCultureProgramName;
+    }
+
+    public void setObeCultureProgramName(String obeCultureProgramName) {
+        this.obeCultureProgramName = obeCultureProgramName;
+    }
+
+    public String getProfessionalName() {
+        return professionalName;
+    }
+
+    public void setProfessionalName(String professionalName) {
+        this.professionalName = professionalName;
+    }
+
+    public Double getRequirementDegree() {
+        return requirementDegree;
+    }
+
+    public void setRequirementDegree(Double requirementDegree) {
+        this.requirementDegree = requirementDegree;
+    }
+}

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

@@ -2,6 +2,7 @@ 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.bean.result.ObeCourseRequirementListResult;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,5 +28,5 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("createId") Long createId, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("createId") Long createId, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.obe.CourseRequirementMatrixDto;
 import com.qmth.distributed.print.business.bean.dto.report.ObeCourseRequirementDto;
 import com.qmth.distributed.print.business.bean.dto.report.ObeSubRequirementsDto;
+import com.qmth.distributed.print.business.bean.result.ObeCourseRequirementListResult;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
 
 import java.util.List;
@@ -60,7 +61,7 @@ public interface ObeCourseRequirementReportService extends IService<ObeCourseReq
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName);
 
     /**
      * 根据培养方案和课程老师id删除报表

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

@@ -9,6 +9,7 @@ import com.qmth.distributed.print.business.bean.dto.obe.CourseRequirementMatrixD
 import com.qmth.distributed.print.business.bean.dto.obe.MatrixRequirementDto;
 import com.qmth.distributed.print.business.bean.dto.obe.MatrixSubRequirementDto;
 import com.qmth.distributed.print.business.bean.dto.report.*;
+import com.qmth.distributed.print.business.bean.result.ObeCourseRequirementListResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseWeightResult;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
 import com.qmth.distributed.print.business.entity.TRBasicInfo;
@@ -213,7 +214,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      * @return
      */
     @Override
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName) {
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, sysUser.getId(), professionalId, cultureProgramName);
     }

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

@@ -2,9 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.distributed.print.business.mapper.ObeCourseRequirementReportMapper">
 
-    <select id="obeCourseRequirementReportList" resultType="com.qmth.distributed.print.business.entity.ObeCourseRequirementReport">
-        select t.* from obe_course_requirement_report t
+    <select id="obeCourseRequirementReportList" resultType="com.qmth.distributed.print.business.bean.result.ObeCourseRequirementListResult">
+        select t.id,
+               t.culture_program_id as cultureProgramId,
+               ocp.name as obeCultureProgramName,
+               bp.name as professionalName,
+               t.requirement_degree as requirementDegree
+                from obe_course_requirement_report t
         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}

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

@@ -6,6 +6,7 @@ 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;
 import com.qmth.distributed.print.business.bean.dto.report.ObeSubRequirementsDto;
+import com.qmth.distributed.print.business.bean.result.ObeCourseRequirementListResult;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementReportService;
@@ -55,7 +56,7 @@ public class ObeReportController {
 
     @ApiOperation(value = "毕业要求达成度报表列表")
     @RequestMapping(value = "/requirements/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ObeCourseRequirementReport.class)})
+    @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,
                                    @ApiParam(value = "培养方案名称") @RequestParam(required = false) String cultureProgramName,