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/service/impl/ObeCultureProgramRequirementServiceImpl.java

@@ -91,12 +91,17 @@ 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);
+
+        ObeCultureProgramRequirement parentRequirement = this.getById(obeCultureProgramRequirement.getId());
+        ObeCultureProgramRequirement cultureProgramRequirement = new ObeCultureProgramRequirement();
+        cultureProgramRequirement.setCultureProgramId(obeCultureProgramRequirement.getCultureProgramId());
+        cultureProgramRequirement.setSortNum(this.getMaxSortNum(cultureProgramRequirement.getCultureProgramId(), obeCultureProgramRequirement.getId()) + 1);
+        cultureProgramRequirement.setName(concatRequirementName(parentRequirement.getSortNum(), cultureProgramRequirement.getSortNum()));
+        cultureProgramRequirement.setParentId(obeCultureProgramRequirement.getId());
+        cultureProgramRequirement.insertInfo(sysUser.getId());
+        if (this.save(cultureProgramRequirement)) {
+            parentRequirement.getSubRequirementList().add(cultureProgramRequirement);
+            obeCourseRequirementMatrixService.updateMatrix(cultureProgramRequirement.getCultureProgramId(), Arrays.asList(parentRequirement), null);
         }
         return true;
     }
@@ -248,7 +253,7 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
             List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementList.stream().map(tpMatrix -> {
                 MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
                 matrixSubRequirementDto.setId(tpMatrix.getId());
-                matrixSubRequirementDto.setName(tpMatrix.getRequirementSortNum() + "-" + tpMatrix.getSubRequirementSortNum());
+                matrixSubRequirementDto.setName(concatRequirementName(tpMatrix.getRequirementSortNum(), tpMatrix.getSubRequirementSortNum()));
                 matrixSubRequirementDto.setScale(tpMatrix.getScale());
                 matrixSubRequirementDto.setContent(tpMatrix.getRequirementContent());
                 return matrixSubRequirementDto;

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

@@ -133,7 +133,7 @@ public class ObeCultureProgramController {
     @ApiOperation(value = "毕业要求-新增指标点")
     @RequestMapping(value = "/requirement/node/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
-    public Result addRequirementNode(@RequestBody ObeCultureProgramRequirement obeCultureProgramRequirement) {
+    public Result addRequirementNode(ObeCultureProgramRequirement obeCultureProgramRequirement) {
         return ResultUtil.ok(obeCultureProgramRequirementService.addRequirementNode(obeCultureProgramRequirement));
     }