Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

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/entity/ObeCourseRequirementReport.java

@@ -28,9 +28,9 @@ public class ObeCourseRequirementReport implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long cultureProgramId;
 
-    @ApiModelProperty(value = "课程大纲id")
+    @ApiModelProperty(value = "创建人id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long obeCourseOutlineId;
+    private Long createId;
 
     @ApiModelProperty(value = "毕业要求雷达报表")
     private String requirementRadar;
@@ -45,9 +45,9 @@ public class ObeCourseRequirementReport implements Serializable {
 
     }
 
-    public ObeCourseRequirementReport(Long cultureProgramId, Long obeCourseOutlineId, String requirementRadar, String requirementDetail, Double requirementDegree) {
+    public ObeCourseRequirementReport(Long cultureProgramId, Long createId, String requirementRadar, String requirementDetail, Double requirementDegree) {
         this.cultureProgramId = cultureProgramId;
-        this.obeCourseOutlineId = obeCourseOutlineId;
+        this.createId = createId;
         this.requirementRadar = requirementRadar;
         this.requirementDetail = requirementDetail;
         this.requirementDegree = requirementDegree;
@@ -69,12 +69,12 @@ public class ObeCourseRequirementReport implements Serializable {
         this.cultureProgramId = cultureProgramId;
     }
 
-    public Long getObeCourseOutlineId() {
-        return obeCourseOutlineId;
+    public Long getCreateId() {
+        return createId;
     }
 
-    public void setObeCourseOutlineId(Long obeCourseOutlineId) {
-        this.obeCourseOutlineId = obeCourseOutlineId;
+    public void setCreateId(Long createId) {
+        this.createId = createId;
     }
 
     public String getRequirementRadar() {

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;
 
@@ -22,10 +23,10 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      *
      * @param iPage
      * @param cultureProgramId
-     * @param obeCourseOutlineId
+     * @param createId
      * @param professionalId
      * @param cultureProgramName
      * @return
      */
-    public IPage<ObeCourseRequirementReport> obeCourseRequirementReportList(IPage<Map> iPage, @Param("cultureProgramId") Long cultureProgramId, @Param("obeCourseOutlineId") Long obeCourseOutlineId, @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;
@@ -56,28 +57,25 @@ 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, Long professionalId, String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long cultureProgramId, Long professionalId, String cultureProgramName);
 
     /**
      * 根据培养方案和课程老师id删除报表
      *
      * @param cultureProgramId
-     * @param obeCourseOutlineId
      * @return
      */
-    public boolean removeReport(Long cultureProgramId, Long obeCourseOutlineId);
+    public boolean removeReport(Long cultureProgramId);
 
     /**
      * 根据培养方案和课程老师id查询报表
      *
      * @param cultureProgramId
-     * @param obeCourseOutlineId
      * @return
      */
-    ObeCourseRequirementReport findByCultureProgramId(Long cultureProgramId, Long obeCourseOutlineId);
+    ObeCourseRequirementReport findByCultureProgramId(Long cultureProgramId);
 }

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;
@@ -16,7 +17,9 @@ 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;
@@ -206,41 +209,38 @@ 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, Long professionalId, String cultureProgramName) {
-        return this.baseMapper.obeCourseRequirementReportList(iPage, cultureProgramId, obeCourseOutlineId, professionalId, 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);
     }
 
     /**
      * 根据培养方案和课程老师id删除报表
      *
      * @param cultureProgramId
-     * @param obeCourseOutlineId
      * @return
      */
     @Override
     @Transactional
-    public boolean removeReport(Long cultureProgramId, Long obeCourseOutlineId) {
-        ObeCourseRequirementReport obeCourseRequirementReport = obeCourseRequirementReportService.findByCultureProgramId(cultureProgramId, obeCourseOutlineId);
-        return obeCourseRequirementReportService.removeById(obeCourseRequirementReport.getId());
+    public boolean removeReport(Long cultureProgramId) {
+        ObeCourseRequirementReport obeCourseRequirementReport = obeCourseRequirementReportService.findByCultureProgramId(cultureProgramId);
+        return Objects.nonNull(obeCourseRequirementReport) ? obeCourseRequirementReportService.removeById(obeCourseRequirementReport.getId()) : false;
     }
 
     /**
      * 根据培养方案和课程老师id查询报表
      *
      * @param cultureProgramId
-     * @param obeCourseOutlineId
      * @return
      */
     @Override
-    public ObeCourseRequirementReport findByCultureProgramId(Long cultureProgramId, Long obeCourseOutlineId) {
-        ObeCourseRequirementReport obeCourseRequirementReport = obeCourseRequirementReportService.getOne(new QueryWrapper<ObeCourseRequirementReport>().lambda().eq(ObeCourseRequirementReport::getCultureProgramId, cultureProgramId).eq(ObeCourseRequirementReport::getObeCourseOutlineId, obeCourseOutlineId));
-        Objects.requireNonNull(obeCourseRequirementReport, "未找到课程毕业达成度报表");
-        return obeCourseRequirementReport;
+    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()));
     }
 }

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

@@ -39,10 +39,14 @@ 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',
-                                                 `obe_course_outline_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`,`obe_course_outline_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程毕业要求报表';
+                                                 UNIQUE KEY `obe_course_requirement_report_unique` (`culture_program_id`,`create_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程毕业要求报表';
+
+UPDATE sys_privilege
+SET name='毕业要求达成度报表列表', url='/api/admin/obe/requirements/list', `type`='URL', parent_id=2070, `sequence`=1, property='AUTH', related=NULL, enable=1, default_auth=1, front_display=1
+WHERE id=2075;

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

@@ -2,15 +2,21 @@
 <!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
-        join obe_culture_program ocp on ocp.id = t.culture_program_id
+    <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}
             </if>
-            <if test="obeCourseOutlineId != null and obeCourseOutlineId != ''">
-                and t.obe_course_outline_id = #{obeCourseOutlineId}
+            <if test="createId != null and createId != ''">
+                and t.create_id = #{createId}
             </if>
             <if test="professionalId != null and professionalId != ''">
                 and ocp.professional_id = #{professionalId}