3.3.4 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/obe/CourseOutlineSubRequirementDto.java

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.bean.dto.obe;
+
+import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
+
+public class CourseOutlineSubRequirementDto extends ObeCultureProgramRequirement {
+
+    private Double scale;
+
+    public Double getScale() {
+        return scale;
+    }
+
+    public void setScale(Double scale) {
+        this.scale = scale;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/obe/CourseRequirementMatrixDto.java

@@ -11,6 +11,7 @@ public class CourseRequirementMatrixDto extends ObeCourseRequirementMatrix {
     private int courseSortNum;
     private int requirementSortNum;
     private int subRequirementSortNum;
+    private String requirementContent;
     // 是否可编辑
     private Boolean canEdit;
     private List<MatrixRequirementDto> requirements;
@@ -70,4 +71,12 @@ public class CourseRequirementMatrixDto extends ObeCourseRequirementMatrix {
     public void setCanEdit(Boolean canEdit) {
         this.canEdit = canEdit;
     }
+
+    public String getRequirementContent() {
+        return requirementContent;
+    }
+
+    public void setRequirementContent(String requirementContent) {
+        this.requirementContent = requirementContent;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/obe/MatrixRequirementDto.java

@@ -7,6 +7,7 @@ import java.util.List;
 public class MatrixRequirementDto extends BasicProfessional {
 
     private String name;
+    private String content;
     private List<MatrixSubRequirementDto> subRequirements;
 
     @Override
@@ -19,6 +20,14 @@ public class MatrixRequirementDto extends BasicProfessional {
         this.name = name;
     }
 
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
     public List<MatrixSubRequirementDto> getSubRequirements() {
         return subRequirements;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/obe/MatrixSubRequirementDto.java

@@ -9,7 +9,8 @@ public class MatrixSubRequirementDto extends BasicProfessional {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     private String name;
-    private Double content;
+    private Double scale;
+    private String content;
 
     @Override
     public Long getId() {
@@ -31,11 +32,19 @@ public class MatrixSubRequirementDto extends BasicProfessional {
         this.name = name;
     }
 
-    public Double getContent() {
+    public Double getScale() {
+        return scale;
+    }
+
+    public void setScale(Double scale) {
+        this.scale = scale;
+    }
+
+    public String getContent() {
         return content;
     }
 
-    public void setContent(Double content) {
+    public void setContent(String content) {
         this.content = content;
     }
 }

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

@@ -37,7 +37,7 @@ public class ObeCourseRequirementMatrix extends BaseEntity implements Serializab
     private Long obeSubRequirementId;
 
     @ApiModelProperty(value = "指标值")
-    private Double content;
+    private Double scale;
 
     @ApiModelProperty(value = "强度")
     private String intensity;
@@ -84,12 +84,12 @@ public class ObeCourseRequirementMatrix extends BaseEntity implements Serializab
         this.obeSubRequirementId = obeSubRequirementId;
     }
 
-    public Double getContent() {
-        return content;
+    public Double getScale() {
+        return scale;
     }
 
-    public void setContent(Double content) {
-        this.content = content;
+    public void setScale(Double scale) {
+        this.scale = scale;
     }
 
     public String getIntensity() {
@@ -107,7 +107,7 @@ public class ObeCourseRequirementMatrix extends BaseEntity implements Serializab
                 ", obeCourseId=" + obeCourseId +
                 ", obeRequirementId=" + obeRequirementId +
                 ", obeSubRequirementId=" + obeSubRequirementId +
-                ", content=" + content +
+                ", scale=" + scale +
                 ", intensity=" + intensity +
                 "}";
     }

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

@@ -1,7 +1,11 @@
 package com.qmth.distributed.print.business.mapper;
 
-import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.bean.dto.obe.CourseOutlineSubRequirementDto;
+import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ObeCultureProgramRequirementMapper extends BaseMapper<ObeCultureProgramRequirement> {
 
+    List<CourseOutlineSubRequirementDto> listSubRequirement(@Param("cultureProgramId") Long cultureProgramId, @Param("courseId") Long courseId);
 }

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

@@ -1,7 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
-import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.dto.obe.CourseOutlineSubRequirementDto;
+import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 
 import java.util.List;
 import java.util.Map;
@@ -37,4 +38,6 @@ public interface ObeCultureProgramRequirementService extends IService<ObeCulture
     Map<Long, Long> copyByCultureProgramId(Long id, Long obeCultureProgramNewId);
 
     List<ObeCultureProgramRequirement> listByCultureProgramId(Long cultureProgramId);
+
+    List<CourseOutlineSubRequirementDto> listSubRequirement(Long cultureProgramId, Long courseId);
 }

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

@@ -16,6 +16,7 @@ import com.qmth.distributed.print.business.service.ObeCourseRequirementMatrixSer
 import com.qmth.distributed.print.business.service.ObeCultureProgramCourseService;
 import com.qmth.distributed.print.business.service.ObeCultureProgramRequirementService;
 import com.qmth.distributed.print.business.service.TeachCourseService;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysPrivilege;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -94,6 +95,7 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
                     ObeCultureProgramRequirement tpRequirement = obeCultureProgramRequirementService.getById(requirementEntry.getKey());
                     MatrixRequirementDto matrixRequirementDto = new MatrixRequirementDto();
                     matrixRequirementDto.setName(tpRequirement.getName());
+                    matrixRequirementDto.setContent(tpRequirement.getContent());
                     List<CourseRequirementMatrixDto> requirementList = requirementEntry.getValue();
                     // 排序，解决字符串1和10排序问题
                     if (requirementList.size() > 1) {
@@ -103,7 +105,8 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
                         MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
                         matrixSubRequirementDto.setId(tpMatrix.getId());
                         matrixSubRequirementDto.setName(tpMatrix.getRequirementSortNum() + "-" + tpMatrix.getSubRequirementSortNum());
-                        matrixSubRequirementDto.setContent(tpMatrix.getContent());
+                        matrixSubRequirementDto.setScale(tpMatrix.getScale());
+                        matrixSubRequirementDto.setContent(tpMatrix.getRequirementContent());
                         return matrixSubRequirementDto;
                     }).collect(Collectors.toList());
                     matrixRequirementDto.setSubRequirements(matrixSubRequirementDtoList);
@@ -121,7 +124,7 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
     public boolean saveMatrix(List<ObeCourseRequirementMatrix> obeCourseRequirementMatrices) {
         for (ObeCourseRequirementMatrix tpMatrix : obeCourseRequirementMatrices) {
             UpdateWrapper<ObeCourseRequirementMatrix> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().set(ObeCourseRequirementMatrix::getContent, tpMatrix.getContent())
+            updateWrapper.lambda().set(ObeCourseRequirementMatrix::getScale, tpMatrix.getScale())
                     .eq(ObeCourseRequirementMatrix::getId, tpMatrix.getId());
             this.update(updateWrapper);
         }
@@ -179,6 +182,7 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
     public void copyByCultureProgramId(Long id, Long obeCultureProgramNewId, Map<Long, Long> requirementIdMap, Map<Long, Long> courseIdMap) {
         List<ObeCourseRequirementMatrix> obeCourseRequirementMatrixList = this.list(new QueryWrapper<ObeCourseRequirementMatrix>().lambda().eq(ObeCourseRequirementMatrix::getCultureProgramId, id));
         for (ObeCourseRequirementMatrix obeCourseRequirementMatrix : obeCourseRequirementMatrixList) {
+            obeCourseRequirementMatrix.setId(SystemConstant.getDbUuid());
             obeCourseRequirementMatrix.setCultureProgramId(obeCultureProgramNewId);
             obeCourseRequirementMatrix.setObeCourseId(courseIdMap.get(obeCourseRequirementMatrix.getObeCourseId()));
             obeCourseRequirementMatrix.setObeRequirementId(requirementIdMap.get(obeCourseRequirementMatrix.getObeRequirementId()));

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.dto.obe.CourseOutlineSubRequirementDto;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementMatrix;
 import com.qmth.distributed.print.business.entity.ObeCultureProgram;
 import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
@@ -152,7 +153,7 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
     }
 
     @Override
-    public List<ObeCultureProgramRequirement> listByCultureProgramIdAndParentId(Long cultureProgramId,Long parentId) {
+    public List<ObeCultureProgramRequirement> listByCultureProgramIdAndParentId(Long cultureProgramId, Long parentId) {
         QueryWrapper<ObeCultureProgramRequirement> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ObeCultureProgramRequirement> lambda = queryWrapper.lambda();
         if (parentId != null) {
@@ -198,6 +199,9 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
             obeCultureProgramRequirement.setId(newId);
             obeCultureProgramRequirement.setCultureProgramId(obeCultureProgramNewId);
         }
+        for (ObeCultureProgramRequirement obeCultureProgramRequirement : obeCultureProgramRequirementList) {
+            obeCultureProgramRequirement.setParentId(idMap.get(obeCultureProgramRequirement.getParentId()));
+        }
         if (CollectionUtils.isNotEmpty(obeCultureProgramRequirementList)) {
             this.saveBatch(obeCultureProgramRequirementList);
         }
@@ -212,6 +216,13 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
         return this.list(queryWrapper);
     }
 
+    @Override
+    public List<CourseOutlineSubRequirementDto> listSubRequirement(Long cultureProgramId, Long courseId) {
+        List<CourseOutlineSubRequirementDto> courseOutlineSubRequirementDtoList = this.baseMapper.listSubRequirement(cultureProgramId, courseId);
+        List<CourseOutlineSubRequirementDto> subRequirementDtoList = courseOutlineSubRequirementDtoList.stream().filter(subRequirementDto -> subRequirementDto.getScale() != null).collect(Collectors.toList());
+        return CollectionUtils.isNotEmpty(subRequirementDtoList) ? subRequirementDtoList : courseOutlineSubRequirementDtoList;
+    }
+
     private String concatRequirementName(int requirementNum, int subRequirementNum) {
         return NAME_PREFIX + requirementNum + "-" + subRequirementNum;
     }

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

@@ -113,7 +113,7 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
         Map<Long, Long> courseIdMap = obeCultureProgramCourseService.copyByCultureProgramId(id, obeCultureProgramNewId);
         // 复制课程毕业要求关系矩阵
         obeCourseRequirementMatrixService.copyByCultureProgramId(id, obeCultureProgramNewId, requirementIdMap, courseIdMap);
-        return false;
+        return true;
     }
 
     @Override

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

@@ -116,3 +116,6 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 -- 2024-06-11
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2068', '基本信息查询', '/api/admin/obe/culture/program/get', 'URL', '2036', '22', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2069', '毕业要求-新增指标点', '/api/admin/obe/culture/program/requirement/node/add', 'URL', '2036', '23', 'AUTH', '1', '1', '1');
+
+-- 2024-06-12
+ALTER TABLE `obe_course_requirement_matrix` CHANGE COLUMN `content` `scale` DOUBLE NULL DEFAULT NULL COMMENT '指标值' ;

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

@@ -22,7 +22,8 @@
             ocrm.*,
             ocpc.sort_num courseSortNum,
             ocpr.sort_num requirementSortNum,
-            socpr.sort_num subRequirementSortNum
+            socpr.sort_num subRequirementSortNum,
+            socpr.content requirementContent
         FROM
             obe_course_requirement_matrix ocrm
                 LEFT JOIN

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

@@ -15,5 +15,17 @@
         <result column="update_id" property="updateId" />
         <result column="update_time" property="updateTime" />
     </resultMap>
+    <select id="listSubRequirement"
+            resultType="com.qmth.distributed.print.business.bean.dto.obe.CourseOutlineSubRequirementDto">
+        SELECT
+            ocpr.*, ocrm.scale
+        FROM
+            obe_course_requirement_matrix ocrm
+                LEFT JOIN
+            obe_culture_program_requirement ocpr ON ocrm.obe_sub_requirement_id = ocpr.id
+        WHERE
+            ocrm.culture_program_id = #{cultureProgramId}
+          AND ocrm.obe_course_id = #{courseId}
+    </select>
 
 </mapper>

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

@@ -5,7 +5,10 @@ import com.qmth.distributed.print.business.bean.params.ObeCourseOutlineParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseBasicInfoResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseOutlineResult;
+import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 import com.qmth.distributed.print.business.service.ObeCourseOutlineService;
+import com.qmth.distributed.print.business.service.ObeCultureProgramCourseService;
+import com.qmth.distributed.print.business.service.ObeCultureProgramRequirementService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
@@ -35,6 +38,8 @@ public class ObeCourseOutlineController {
 
     @Resource
     private ObeCourseOutlineService obeCourseOutlineService;
+    @Resource
+    private ObeCultureProgramRequirementService obeCultureProgramRequirementService;
 
     @ApiOperation(value = "课程大纲-查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
@@ -98,4 +103,12 @@ public class ObeCourseOutlineController {
     public Result findCourseWeightSettingStatus(@ApiParam(value = "课程大纲id", required = true) @RequestParam String obeCourseOutlineId) {
         return ResultUtil.ok(obeCourseOutlineService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(obeCourseOutlineId)));
     }
+
+    @ApiOperation(value = "根据培养方案、课程查询指标点")
+    @RequestMapping(value = "/sub_requirement/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Result.class)})
+    public Result listCourse(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
+                             @ApiParam(value = "课程ID", required = true) @RequestParam Long courseId) {
+        return ResultUtil.ok(obeCultureProgramRequirementService.listSubRequirement(cultureProgramId, courseId));
+    }
 }