课程专业达成度雷达报表

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ObeCourseRequirementDto.java

@@ -24,6 +24,9 @@ public class ObeCourseRequirementDto implements Serializable {
     @ApiModelProperty(value = "课程名称")
     private String courseName;
 
+    @ApiModelProperty(value = "学期")
+    private String semesterName;
+
     @ApiModelProperty(value = "课程毕业指标达成值")
     private BigDecimal matrixDegree;
 
@@ -37,6 +40,7 @@ public class ObeCourseRequirementDto implements Serializable {
     public ObeCourseRequirementDto(CourseRequirementMatrixDto courseRequirementMatrixDto) {
         this.courseCode = courseRequirementMatrixDto.getCourseCode();
         this.courseName = courseRequirementMatrixDto.getCourseName();
+        this.semesterName = "测试学期1";
     }
 
     public void updateInfo() {
@@ -44,6 +48,14 @@ public class ObeCourseRequirementDto implements Serializable {
         this.courseName = null;
     }
 
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ObeCourseRequirementReport.java

@@ -28,10 +28,6 @@ public class ObeCourseRequirementReport implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long cultureProgramId;
 
-    @ApiModelProperty(value = "创建人id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long createId;
-
     @ApiModelProperty(value = "毕业要求雷达报表")
     private String requirementRadar;
 
@@ -45,9 +41,8 @@ public class ObeCourseRequirementReport implements Serializable {
 
     }
 
-    public ObeCourseRequirementReport(Long cultureProgramId, Long createId, String requirementRadar, String requirementDetail, Double requirementDegree) {
+    public ObeCourseRequirementReport(Long cultureProgramId, String requirementRadar, String requirementDetail, Double requirementDegree) {
         this.cultureProgramId = cultureProgramId;
-        this.createId = createId;
         this.requirementRadar = requirementRadar;
         this.requirementDetail = requirementDetail;
         this.requirementDegree = requirementDegree;
@@ -69,14 +64,6 @@ public class ObeCourseRequirementReport implements Serializable {
         this.cultureProgramId = cultureProgramId;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
     public String getRequirementRadar() {
         return requirementRadar;
     }

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

@@ -23,10 +23,9 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      *
      * @param iPage
      * @param cultureProgramId
-     * @param createId
      * @param professionalId
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementListResult> 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("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
 }

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

@@ -17,9 +17,7 @@ import com.qmth.distributed.print.business.mapper.ObeCourseRequirementReportMapp
 import com.qmth.distributed.print.business.service.ObeCourseRequirementReportService;
 import com.qmth.distributed.print.business.service.TRBasicInfoService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.util.JacksonUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -215,8 +213,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      */
     @Override
     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);
+        return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, professionalId, cultureProgramName);
     }
 
     /**
@@ -240,7 +237,6 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      */
     @Override
     public ObeCourseRequirementReport findByCultureProgramId(Long cultureProgramId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return obeCourseRequirementReportService.getOne(new QueryWrapper<ObeCourseRequirementReport>().lambda().eq(ObeCourseRequirementReport::getCultureProgramId, cultureProgramId).eq(ObeCourseRequirementReport::getCreateId, sysUser.getId()));
+        return obeCourseRequirementReportService.getOne(new QueryWrapper<ObeCourseRequirementReport>().lambda().eq(ObeCourseRequirementReport::getCultureProgramId, cultureProgramId));
     }
 }

distributed-print-business/src/main/resources/db/log/wangliang.sql

@@ -39,12 +39,11 @@ DROP TABLE IF EXISTS `obe_course_requirement_report`;
 CREATE TABLE `obe_course_requirement_report` (
                                                  `id` bigint NOT NULL COMMENT '主键',
                                                  `culture_program_id` bigint NOT NULL COMMENT '培养方案id',
-                                                 `create_id` bigint NOT NULL COMMENT '创建人id',
                                                  `requirement_radar` mediumtext NOT NULL COMMENT '毕业要求雷达报表',
                                                  `requirement_detail` mediumtext NOT NULL COMMENT '毕业要求详情报表',
                                                  `requirement_degree` double NOT NULL COMMENT '毕业要求达成值',
                                                  PRIMARY KEY (`id`),
-                                                 UNIQUE KEY `obe_course_requirement_report_unique` (`culture_program_id`,`create_id`)
+                                                 UNIQUE KEY `obe_course_requirement_report_unique` (`culture_program_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程毕业要求报表';
 
 UPDATE sys_privilege

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

@@ -15,9 +15,6 @@
             <if test="cultureProgramId != null and cultureProgramId != ''">
                 and t.culture_program_id = #{cultureProgramId}
             </if>
-            <if test="createId != null and createId != ''">
-                and t.create_id = #{createId}
-            </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

@@ -12,11 +12,9 @@ import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementReportService;
 import com.qmth.distributed.print.business.service.TRExamStudentService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.util.JacksonUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,11 +82,9 @@ public class ObeReportController {
             Map<Long, List<ObeSubRequirementsDto>> obeSubRequirementsDtoMap = (Map<Long, List<ObeSubRequirementsDto>>) map.get(SystemConstant.OBE_SUB_REQUIREMENT_DTO_MAP);
             obeCourseRequirementResultDto = obeCourseRequirementReportService.matrixCourseReport(obeCourseRequirementDtoList, obeSubRequirementsDtoMap);
         }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         obeCourseRequirementReportService.removeReport(cultureProgramId);
         ObeCourseRequirementReport obeCourseRequirementReport = new ObeCourseRequirementReport(
-                cultureProgramId, sysUser.getId(),
-                Objects.nonNull(obeCourseRequirementResultDto) ? JacksonUtil.parseJson(obeCourseRequirementResultDto) : null,
+                cultureProgramId, Objects.nonNull(obeCourseRequirementResultDto) ? JacksonUtil.parseJson(obeCourseRequirementResultDto) : null,
                 !CollectionUtils.isEmpty(obeCourseRequirementDtoList) ? JacksonUtil.parseJson(obeCourseRequirementDtoList) : null, Objects.nonNull(obeCourseRequirementResultDto) ? obeCourseRequirementResultDto.getMatrixDegree().doubleValue() : null);
         obeCourseRequirementReportService.save(obeCourseRequirementReport);
         return ResultUtil.ok(obeCourseRequirementResultDto);