3.3.4 update

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

@@ -48,6 +48,8 @@ public class ObeCultureProgram extends BaseEntity implements Serializable {
     private Integer courseCount;
     @ApiModelProperty(value = "总体描述")
     private String description;
+    @ApiModelProperty(value = "总体描述")
+    private Double expectValue;
     public Long getProfessionalId() {
         return professionalId;
     }
@@ -92,6 +94,14 @@ public class ObeCultureProgram extends BaseEntity implements Serializable {
         this.description = description;
     }
 
+    public Double getExpectValue() {
+        return expectValue;
+    }
+
+    public void setExpectValue(Double expectValue) {
+        this.expectValue = expectValue;
+    }
+
     @Override
     public String toString() {
         return "ObeCultureProgram{" +

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

@@ -19,4 +19,6 @@ import org.apache.ibatis.annotations.Param;
 public interface ObeCultureProgramMapper extends BaseMapper<ObeCultureProgram> {
 
     IPage<CultureProgramResult> pageData(@Param("page") Page<CultureProgramResult> page, @Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, @Param("name") String name, @Param("dpr") DataPermissionRule dpr);
+
+    CultureProgramResult getByCultureProgramId(Long id);
 }

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

@@ -20,13 +20,15 @@ public interface ObeCultureProgramRequirementService extends IService<ObeCulture
 
     boolean saveRequirement(ObeCultureProgramRequirement obeCultureProgramRequirement);
 
+    boolean addRequirementNode(ObeCultureProgramRequirement obeCultureProgramRequirement);
+
     int getMaxSortNum(Long cultureProgramId, Long parentId);
 
     boolean removeRequirement(Long id);
 
     void initRequirement(Long cultureProgramId);
 
-    List<ObeCultureProgramRequirement> listByParentId(Long parentId);
+    List<ObeCultureProgramRequirement> listByCultureProgramIdAndParentId(Long cultureProgramId, Long parentId);
 
     boolean saveRequirementExpect(ObeCultureProgramRequirement obeCultureProgramRequirement);
 

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

@@ -34,4 +34,6 @@ public interface ObeCultureProgramService extends IService<ObeCultureProgram> {
     boolean saveDescription(ObeCultureProgramDescriptionParam obeCultureProgramDescriptionParam);
 
     Long copyByCultureProgramId(Long id);
+
+    CultureProgramResult getByCultureProgramId(Long id);
 }

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

@@ -5,11 +5,13 @@ 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.entity.ObeCourseRequirementMatrix;
+import com.qmth.distributed.print.business.entity.ObeCultureProgram;
 import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 import com.qmth.distributed.print.business.enums.CultureProgramRequirementEnum;
 import com.qmth.distributed.print.business.mapper.ObeCultureProgramRequirementMapper;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementMatrixService;
 import com.qmth.distributed.print.business.service.ObeCultureProgramRequirementService;
+import com.qmth.distributed.print.business.service.ObeCultureProgramService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -35,6 +37,8 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
 
     private static final String NAME_PREFIX = "指标点";
 
+    @Resource
+    private ObeCultureProgramService obeCultureProgramService;
     @Resource
     private ObeCourseRequirementMatrixService obeCourseRequirementMatrixService;
 
@@ -77,6 +81,19 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
         }
     }
 
+    @Override
+    public boolean addRequirementNode(ObeCultureProgramRequirement obeCultureProgramRequirement) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        ObeCultureProgramRequirement cultureProgramRequirement = this.getById(obeCultureProgramRequirement.getId());
+        obeCultureProgramRequirement.setSortNum(this.getMaxSortNum(cultureProgramRequirement.getCultureProgramId(), obeCultureProgramRequirement.getId()) + 1);
+        obeCultureProgramRequirement.setName(concatRequirementName(cultureProgramRequirement.getSortNum(), obeCultureProgramRequirement.getSortNum()));
+        obeCultureProgramRequirement.insertInfo(sysUser.getId());
+        if (this.save(obeCultureProgramRequirement)) {
+            obeCourseRequirementMatrixService.updateMatrix(obeCultureProgramRequirement.getCultureProgramId(), Arrays.asList(obeCultureProgramRequirement), null);
+        }
+        return true;
+    }
+
     @Override
     public int getMaxSortNum(Long cultureProgramId, Long parentId) {
         QueryWrapper<ObeCultureProgramRequirement> queryWrapper = new QueryWrapper<>();
@@ -102,7 +119,7 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
         ObeCultureProgramRequirement obeCultureProgramRequirementParent = this.getById(obeCultureProgramRequirement.getParentId());
         obeCourseRequirementMatrixService.removeMatrixByCondition(new ObeCourseRequirementMatrix(null, null, null, id));
         if (this.removeById(id)) {
-            List<ObeCultureProgramRequirement> obeCultureProgramRequirementList = this.listByParentId(obeCultureProgramRequirement.getParentId());
+            List<ObeCultureProgramRequirement> obeCultureProgramRequirementList = this.listByCultureProgramIdAndParentId(obeCultureProgramRequirement.getCultureProgramId(), obeCultureProgramRequirement.getParentId());
             if (CollectionUtils.isEmpty(obeCultureProgramRequirementList)) {
                 throw ExceptionResultEnum.ERROR.exception("当前数据为最后一个节点，无法删除");
             }
@@ -135,7 +152,7 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
     }
 
     @Override
-    public List<ObeCultureProgramRequirement> listByParentId(Long parentId) {
+    public List<ObeCultureProgramRequirement> listByCultureProgramIdAndParentId(Long cultureProgramId,Long parentId) {
         QueryWrapper<ObeCultureProgramRequirement> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ObeCultureProgramRequirement> lambda = queryWrapper.lambda();
         if (parentId != null) {
@@ -147,11 +164,17 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
         return this.list(queryWrapper);
     }
 
+    @Transactional
     @Override
     public boolean saveRequirementExpect(ObeCultureProgramRequirement obeCultureProgramRequirement) {
         if (obeCultureProgramRequirement.getCultureProgramId() == null) {
             throw ExceptionResultEnum.ERROR.exception("培养方案ID有误");
         }
+        UpdateWrapper<ObeCultureProgram> obeCultureProgramUpdateWrapper = new UpdateWrapper<>();
+        obeCultureProgramUpdateWrapper.lambda().set(ObeCultureProgram::getExpectValue, obeCultureProgramRequirement.getExpectValue())
+                .eq(ObeCultureProgram::getId, obeCultureProgramRequirement.getCultureProgramId());
+        obeCultureProgramService.update(obeCultureProgramUpdateWrapper);
+
         UpdateWrapper<ObeCultureProgramRequirement> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(ObeCultureProgramRequirement::getExpectValue, obeCultureProgramRequirement.getExpectValue())
                 .eq(ObeCultureProgramRequirement::getCultureProgramId, obeCultureProgramRequirement.getCultureProgramId())

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

@@ -182,4 +182,9 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
         this.save(obeCultureProgram);
         return obeCultureProgram.getId();
     }
+
+    @Override
+    public CultureProgramResult getByCultureProgramId(Long id) {
+        return this.baseMapper.getByCultureProgramId(id);
+    }
 }

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

@@ -81,7 +81,7 @@ public class ObeRequirementTargetMatrixServiceImpl extends ServiceImpl<ObeRequir
     @Override
     public void updateMatrix(ObeCultureProgramTarget obeCultureProgramTarget) {
         // 查询一级毕业要求
-        List<ObeCultureProgramRequirement> obeCultureProgramRequirementList = obeCultureProgramRequirementService.listByParentId(null);
+        List<ObeCultureProgramRequirement> obeCultureProgramRequirementList = obeCultureProgramRequirementService.listByCultureProgramIdAndParentId(obeCultureProgramTarget.getCultureProgramId(), null);
         List<ObeRequirementTargetMatrix> obeRequirementTargetMatrixList = obeCultureProgramRequirementList.stream().map(m -> new ObeRequirementTargetMatrix(obeCultureProgramTarget.getCultureProgramId(), m.getId(), obeCultureProgramTarget.getId())).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(obeRequirementTargetMatrixList)) {
             this.saveBatch(obeRequirementTargetMatrixList);

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

@@ -6,6 +6,7 @@ CREATE TABLE `obe_culture_program` (
           `requirement_count` INT NULL DEFAULT 0 COMMENT '毕业要求数量',
           `course_count` INT NULL DEFAULT 0 COMMENT '课程体系数量',
           `description` MEDIUMTEXT NULL COMMENT '总体描述',
+          `expect_value` DOUBLE NULL COMMENT '期望值',
           `create_id` BIGINT(20) NULL COMMENT '创建人ID',
           `create_time` BIGINT(20) NULL COMMENT '创建时间',
           `update_id` BIGINT(20) NULL COMMENT '更新人ID',
@@ -67,7 +68,7 @@ CREATE TABLE `obe_requirement_target_matrix` (
 
 UPDATE `sys_privilege` SET `name` = '培养方案管理', `url` = 'CultureProgramManage' WHERE (`id` = '2035');
 UPDATE `sys_privilege` SET `name` = '培养方案管理', `url` = 'CultureProgram' WHERE (`id` = '2036');
-UPDATE `sys_privilege` SET `name` = '查看详情', `url` = 'CultureProgramDetail', `related` = '2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2058,2059,2060,2066,2067' WHERE (`id` = '2041');
+UPDATE `sys_privilege` SET `name` = '查看详情', `url` = 'CultureProgramDetail', `related` = '2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2058,2059,2060,2066,2067,2068,2069' WHERE (`id` = '2041');
 UPDATE `sys_privilege` SET `url` = '/api/admin/obe/culture/program/page' WHERE (`id` = '2042');
 UPDATE `sys_privilege` SET `url` = '/api/admin/obe/culture/program/save' WHERE (`id` = '2043');
 UPDATE `sys_privilege` SET `name` = '课程体系-选择课程', `url` = '/api/admin/obe/culture/program/course/query_list' WHERE (`id` = '2044');
@@ -110,3 +111,8 @@ UPDATE `sys_privilege` SET `related` = '536,540' WHERE (`id` = '522');
 UPDATE `sys_privilege` SET `related` = '2042,540' WHERE (`id` = '2038');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2066', '保存总体描述', '/api/admin/obe/culture/program/description/save', 'URL', '2036', '20', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2067', '设置期望值', '/api/admin/obe/culture/program/requirement/expect/save', 'URL', '2036', '21', 'AUTH', '1', '1', '1');
+
+
+-- 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');

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

@@ -52,5 +52,21 @@
             </if>
         </where>
     </select>
+    <select id="getByCultureProgramId"
+            resultType="com.qmth.distributed.print.business.bean.result.obe.cultureProgram.CultureProgramResult"
+            parameterType="java.lang.Long">
+        SELECT
+            ocp.*,
+            bp.name professionalName,
+            su.login_name createLoginName,
+            su.real_name createRealName
+        FROM
+            obe_culture_program ocp
+                LEFT JOIN
+            basic_professional bp ON ocp.professional_id = bp.id
+                LEFT JOIN
+            sys_user su ON ocp.create_id = su.id
+        where ocp.id = #{id}
+    </select>
 
 </mapper>

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

@@ -86,6 +86,13 @@ public class ObeCultureProgramController {
         return ResultUtil.ok(obeCultureProgramService.saveDescription(obeCultureProgramDescriptionParam));
     }
 
+    @ApiOperation(value = "基本信息查询")
+    @RequestMapping(value = "/get", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "保存总体描述", response = Boolean.class)})
+    public Result get(@ApiParam(value = "培养方案ID", required = true) @RequestParam(value = "id") Long id) {
+        return ResultUtil.ok(obeCultureProgramService.getByCultureProgramId(id));
+    }
+
     @ApiOperation(value = "培养目标-列表")
     @RequestMapping(value = "/target/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "培养目标-列表", response = Boolean.class)})
@@ -123,6 +130,13 @@ public class ObeCultureProgramController {
         return ResultUtil.ok(obeCultureProgramRequirementService.saveRequirement(obeCultureProgramRequirement));
     }
 
+    @ApiOperation(value = "毕业要求-新增指标点")
+    @RequestMapping(value = "/requirement/node/add", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
+    public Result addRequirementNode(@RequestBody ObeCultureProgramRequirement obeCultureProgramRequirement) {
+        return ResultUtil.ok(obeCultureProgramRequirementService.addRequirementNode(obeCultureProgramRequirement));
+    }
+
     @ApiOperation(value = "毕业要求-删除")
     @RequestMapping(value = "/requirement/remove", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除", response = Boolean.class)})