二期ICSS后台模板维护修改接口

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -129,13 +129,27 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      */
     public Boolean updateModuleInfo(UpdateModuleInfoVO updateModuleInfoVO) {
         String userId = UserUtils.getCurrentPrincipleID();
+        QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
+        moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .notIn("id",updateModuleInfoVO.getId());
+        List<ModuleInfo> moduleInfos = this.list(moduleInfoQueryWrapper);
+        for (ModuleInfo moduleInfo: moduleInfos) {
+            if(moduleInfo.getName().equals(updateModuleInfoVO.getName())){
+                throw new CommonException(CommonErrorCode.IS_EXISTS,
+                        "模板名称重复");
+            }
+        }
         UpdateWrapper<ModuleInfo> moduleInfoUpdateWrapper = new UpdateWrapper<>();
         moduleInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", updateModuleInfoVO.getId())
                 .set("name", updateModuleInfoVO.getName())
                 .set("type", updateModuleInfoVO.getType())
+                .set("module_type",updateModuleInfoVO.getModuleType())
                 .set("modifier", userId)
                 .set("gmt_modified", DateUtil.now());
+        if(updateModuleInfoVO.getRelationId() != null){
+            moduleInfoUpdateWrapper.set("relation_id", updateModuleInfoVO.getRelationId());
+        }
         this.update(new ModuleInfo(), moduleInfoUpdateWrapper);
         AddModuleInfoVO addModuleInfoVO = new AddModuleInfoVO();
         BeanUtil.copyProperties(updateModuleInfoVO, addModuleInfoVO);
@@ -279,7 +293,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //获取模板明细
         QueryWrapper<ModuleDetail> moduleDetailQueryWrapper = new QueryWrapper<>();
         moduleDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("module_id", getModuleDetailInfoVO.getModuleId());
+                .eq("module_id", getModuleDetailInfoVO.getModuleId())
+                .orderByAsc("order_no");
         List<ModuleDetail> moduleDetailList = moduleDetailFacade.list(moduleDetailQueryWrapper);
         //获取标签信息
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();

icssman-service/src/main/java/com/diagbot/vo/UpdateModuleInfoVO.java

@@ -14,12 +14,16 @@ import java.util.List;
 @Getter
 @Setter
 public class UpdateModuleInfoVO {
-    @NotNull(message="模板id")
+    @NotNull(message="模板id不能为空")
     private Long id;
-    @NotNull(message="模板名称")
+    @NotNull(message="模板名称不能为空")
     private String name;
-    @NotNull(message="模板类型")
+    @NotNull(message="模板属于不能为空")
     private int type;
-    @NotNull(message="标签id")
+    @NotNull(message="标签id不能为空")
     private List<AddModuleDetailVO> modelDetils;
+    @NotNull(message="模板类型不能为空")
+    private Long moduleType;
+    //关联id
+    private Long relationId;
 }

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -55,7 +55,8 @@ public class ModuleInfoController {
                     "relationModule: 关联模板id<br>" +
                     "text: 特殊标签（如逗号句号）<br>" +
                     "textType: 特殊标签归属类型<br>" +
-                    "moduleType: 模板类型，必填")
+                    "moduleType: 模板类型，必填<br>" +
+                    "relationId: 关联id，moduleType为0不用传，moduleType为1传科室id，moduleType为2传疾病id")
     @PostMapping("/saveModuleInfo")
     @SysLogger("saveModuleInfo")
     @Transactional
@@ -64,13 +65,15 @@ public class ModuleInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "模板修改[by:wangyu]",
+    @ApiOperation(value = "【二期】模板修改[by:wangyu]",
             notes = "id: 模板id，必填<br>" +
                     "name: 模板名称，必填<br>" +
                     "type: 模板类型，必填<br>" +
                     "questionId: 标签id，必填<br>" +
                     "flag: 特殊标示类型<br>" +
-                    "relationModule: 关联模板id")
+                    "relationModule: 关联模板id<br>"+
+                    "moduleType: 模板类型，必填<br>" +
+                    "relationId: 关联id，moduleType为0不用传，moduleType为1传科室id，moduleType为2传疾病id")
     @PostMapping("/updateModuleInfo")
     @SysLogger("updateModuleInfo")
     @Transactional