优化代码和注解

src/main/java/com/diagbot/facade/PlanFacade.java

@@ -25,6 +25,7 @@ import com.diagbot.vo.HospitalPlanPageVO;
 import com.diagbot.vo.HospitalPlanSaveVO;
 import com.diagbot.vo.HospitalPlanVO;
 import com.diagbot.vo.HospitalSetVO;
+import com.diagbot.vo.PlanDetailCancelVO;
 import com.diagbot.vo.PlanRevStopVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -163,6 +164,9 @@ public class PlanFacade extends PlanServiceImpl {
     }
 
     public boolean cancelPlanData(HospitalPlanCancelVO hospitalPlanCancelVO) {
+        PlanDetailCancelVO planDetailCancelVO = new PlanDetailCancelVO();
+        planDetailCancelVO.setHospitalId(hospitalPlanCancelVO.getHospitalId());
+        planDetailCancelVO.setPlanId(hospitalPlanCancelVO.getPlanId());
         boolean res = false;
         // 1.先判断数据是否存在有效
         checkPlan(hospitalPlanCancelVO.getPlanId());
@@ -170,10 +174,13 @@ public class PlanFacade extends PlanServiceImpl {
         planNew
                 .eq("id", hospitalPlanCancelVO.getPlanId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalPlanCancelVO.getHospitalId())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
         res = update(new Plan(), planNew);
+        //再删除明细
+        sysSetFacade.cancelPlanDetail(planDetailCancelVO);
 
         return res;
     }

src/main/java/com/diagbot/vo/HospitalPlanCancelVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wangfeng
  * @Description:
@@ -11,8 +13,11 @@ import lombok.Setter;
 @Setter
 @Getter
 public class HospitalPlanCancelVO {
+    @NotNull(message = "请输入医院Id")
+    private Long hospitalId;
     /**
-     * 方案编号
+     * 方案id
      */
+    @NotNull(message = "请输入方案id")
     private Long planId;
 }

src/main/java/com/diagbot/vo/HospitalPlanSaveVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -13,25 +15,30 @@ import java.util.List;
 @Setter
 @Getter
 public class HospitalPlanSaveVO {
-    private Long Id;
+
+    private Long id;
     /**
      * 医院编码
      */
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
 
     /**
      * 方案名称
      */
+    @NotBlank(message = "请输入方案名称")
     private String planName;
 
     /**
      * 方案编号
      */
+    @NotBlank(message = "请输入方案编号")
     private String planCode;
 
     /**
      * 方案启动1：启动，0：不启用
      */
+    @NotNull(message = "请输状态")
     private Integer planStatus;
 
     /**

src/main/java/com/diagbot/vo/HospitalPlanVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @author wangfeng
  * @Description:
@@ -14,5 +16,6 @@ public class HospitalPlanVO extends HospitalBaseVO {
     /**
      * 方案编号
      */
+    @NotBlank(message = "请输入方案编号")
     private String planCode;
 }

src/main/java/com/diagbot/vo/HospitalSetVO.java

@@ -15,5 +15,4 @@ import java.util.List;
 public class HospitalSetVO extends HospitalBaseVO {
     private List<Long> planId;
     private String code;
-    private Long parentId;
 }

src/main/java/com/diagbot/vo/PlanDetailCancelVO.java

@@ -19,5 +19,6 @@ public class PlanDetailCancelVO {
     /**
      * 方案编号
      */
+    @NotNull(message = "请输入方案Id")
     private Long planId;
 }

src/main/java/com/diagbot/vo/PlanDetailRevStopVO.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class PlanDetailRevStopVO {
     @NotNull(message = "请输入Id")
-    private Long Id;
+    private Long id;
     @NotNull(message = "请输入状态")
     private Integer status;
 }

src/main/java/com/diagbot/vo/PlanDetailSaveVO.java

@@ -3,21 +3,26 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
  * @author wangfeng
  * @Description:
  * @date 2020-08-03 17:30
- */@Setter
+ */
+@Setter
 @Getter
 public class PlanDetailSaveVO {
+
     private Long planId;
     /**
      * 医院编码
      */
+    @NotNull(message = "请输入医院Id")
     private Long hospitalId;
 
-    private  List<HospitalPlanDetailSaveVO> planDetailParent;
+    private List<HospitalPlanDetailSaveVO> planDetailParent;
 
 }

src/main/java/com/diagbot/vo/PlanRevStopVO.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class PlanRevStopVO {
     @NotNull(message = "请输入Id")
-    private Long Id;
+    private Long id;
     @NotNull(message = "请输入状态")
     private Integer status;
 }

src/main/java/com/diagbot/web/DisclaimerInfoController.java

@@ -33,7 +33,7 @@ public class DisclaimerInfoController {
     @Autowired
     DisclaimerInfoFacade disclaimerInfoFacade;
 
-    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "disclaimerCode:免责申明编号")
     @PostMapping("/getDisclaimerInfo")
     @SysLogger("getDisclaimerInfo")
     public RespDTO<List<DisclaimerInfoDTO>> getDisclaimerInfo(@RequestBody DisclaimerInfoVO disclaimerInfoVO) {

src/main/java/com/diagbot/web/PlanController.java

@@ -39,7 +39,7 @@ public class PlanController {
     @Autowired
     PlanFacade planFacade;
 
-    @ApiOperation(value = "根据医院获取方案配置信息[by:wangfeng]", notes = "hospitalid ：医院id  必填<br> ")
+    @ApiOperation(value = "根据医院获取方案配置信息[by:wangfeng]", notes = "planCode ：方案编号  <br> ")
     @PostMapping("/getSysPlanInfoDatas")
     @SysLogger("getSysPlanInfoDatas")
     @TokenAuth
@@ -48,7 +48,8 @@ public class PlanController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "保存更新方案配置信息[by:wangfeng]", notes = "保存更新方案配置信息")
+    @ApiOperation(value = "保存更新方案配置信息[by:wangfeng]", notes = "id:方案id <br> hospitalId :医院id 必传" +
+            "planName：方案名称 必传 <br>  planCode:方案编号 必传<br> planStatus: 方案启动1：启动，0：不启用 必传")
     @PostMapping("/savePlanInfoDatas")
     @SysLogger("savePlanInfoDatas")
     @Transactional
@@ -66,7 +67,7 @@ public class PlanController {
         return RespDTO.onSuc(data);
     }*/
 
-    @ApiOperation(value = "删除方案配置信息[by:wangfeng]", notes = "删除方案配置信息")
+    @ApiOperation(value = "删除方案配置信息[by:wangfeng]", notes = "planId：方案id 必传")
     @PostMapping("/cancelPlanDatas")
     @SysLogger("cancelPlanDatas")
     @Transactional
@@ -75,7 +76,7 @@ public class PlanController {
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "停用启用方案配置[by:wangfeng]", notes = "停用启用方案配置")
+    @ApiOperation(value = "停用启用方案配置[by:wangfeng]", notes = "id :方案id 必传 <br>status:状态必传 ")
     @PostMapping("/revStopPlans")
     @SysLogger("revStopPlans")
     @Transactional

src/main/java/com/diagbot/web/PlanDetailController.java

@@ -37,7 +37,8 @@ public class PlanDetailController {
     @Autowired
     PlanDetailFacade planDetailFacade;
 
-    @ApiOperation(value = "根据医院编码获取配置信息明细[by:wangfeng]", notes = "hospitalId ：医院id  必填<br> ")
+    @ApiOperation(value = "根据医院编码获取配置信息明细[by:wangfeng]", notes = " hospitalId ：医院id <必传>" +
+            "List<Long> planId;方案id  code：明细code ")
     @PostMapping("/getPlanDetailDatas")
     @SysLogger("getPlanDetailDatas")
     @TokenAuth
@@ -64,7 +65,7 @@ public class PlanDetailController {
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "停用启用方案配置明细[by:wangfeng]", notes = "停用启用方案配置明细")
+    @ApiOperation(value = "停用启用方案配置明细[by:wangfeng]", notes = "id:方案配置id<br>status:状态")
     @PostMapping("/revStopPlanDetails")
     @SysLogger("revStopPlanDetails")
     @Transactional

src/main/java/com/diagbot/web/TokenHospitalController.java

@@ -35,7 +35,7 @@ public class TokenHospitalController {
     private TokenHospitalFacade tokenHospitalFacade;
 
     @ApiOperation(value = "根据医院id获取医院token信息[by:wangfeng]",
-            notes = "HospitalId：医院id<br>")
+            notes = "hospitalId：医院id<br>")
     @PostMapping("/getTokenHospital")
     @SysLogger("getTokenHospital")
     public RespDTO<TokenHospitaDTO> getTokenHospital(@RequestBody @Valid TokenHospitalVO tokenHospitalVO) {