init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysImplementPlanDTO.java

@@ -41,7 +41,7 @@ public final class SysImplementPlanDTO {
          * 父ID
          */
         @NotNull(message = "关联计划ID必填")
-        private Long parentId;
+        private Integer parentId;
 
         /**
          * 计划值

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysImplementPlanDetailsDTO.java

@@ -53,7 +53,7 @@ public final class SysImplementPlanDetailsDTO {
          * 任务类型数量
          */
         @NotNull(message = "任务类型数量必填")
-        @Min(value = 1, message = "任务类型数量最小值为{value}")
+        @Min(value = 0, message = "任务类型数量最小值为{value}")
         private Integer qty;
 
         /**
@@ -72,7 +72,7 @@ public final class SysImplementPlanDetailsDTO {
          * 任务类型小记
          */
         @NotNull(message = "任务类型小记必填")
-        @Min(value = 1, message = "任务类型小记最小值为{value}")
+        @Min(value = 0, message = "任务类型小记最小值为{value}")
         private Long subtotal;
 
     }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysImplementPlanVO.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.api.vo;
 
+import com.qunzhixinxi.hnqz.admin.api.entity.SysImplPlanDetails;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplementPlan;
 import lombok.AccessLevel;
 import lombok.Data;
@@ -40,7 +41,7 @@ public final class SysImplementPlanVO {
         /**
          * 计划详情
          */
-        private Integer planDetailId;
+        private SysImplPlanDetails planDetails;
 
 
     }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/WmTaskTypeVO.java

@@ -4,6 +4,7 @@ package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -13,104 +14,104 @@ import java.time.LocalDateTime;
  * @date 2020-07-01 20:20:05
  */
 @Data
-public class WmTaskTypeVO {
-	private static final long serialVersionUID = 1L;
-
-	private String id;
-	/**
-	 * 任务类型名称
-	 */
-	private String taskTypeName;
-	/**
-	 * 任务类型级别
-	 */
-	private String taskTypeLevel;
-
-
-	/**
-	 * 规则类型，1药企 2一级代理商
-	 */
-	private String status;
-
-	/**
-	 * 药企ID
-	 */
-	private String durgentId;
-
-	/**
-	 * 药企ID
-	 */
-	private String level1Id;
-
-	/**
-	 * 药企ID
-	 */
-	private String taskEntId;
-
-	/**
-	 * 完成后可获得分
-	 */
-	private String score;
-	/**
-	 * 积分范围开始
-	 */
-	private String taskScoreStart;
-	/**
-	 * 积分范围结束
-	 */
-	private String taskScoreEnd;
-	/**
-	 * 组织机构ID
-	 */
-	private String deptId;
-	/**
-	 * 是否删除
-	 */
-	private String delFlag;
-	/**
-	 * 是否禁用
-	 */
-	private String enableFlag;
-	/**
-	 * 所属租户
-	 */
-	private Integer tenantId;
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-	/**
-	 * 创建人
-	 */
-	private Integer createUser;
-	/**
-	 * 更新时间
-	 */
-	private LocalDateTime updateTime;
-	/**
-	 * 更新人
-	 */
-	private Integer updateUser;
-
-	/**
-	 * 基础id
-	 */
-	private String baseId;
-
-	private String realFlag;
-	/**
-	 * 规则id
-	 */
-	private String ruleId;
-
-	/**
-	 * 父级id
-	 */
-	private String parentId;
-
-	/**
-	 * 任务备注
-	 */
-	private String taskRemark;
+public class WmTaskTypeVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+    /**
+     * 任务类型名称
+     */
+    private String taskTypeName;
+    /**
+     * 任务类型级别
+     */
+    private String taskTypeLevel;
+
+
+    /**
+     * 规则类型，1药企 2一级代理商
+     */
+    private String status;
+
+    /**
+     * 药企ID
+     */
+    private String durgentId;
+
+    /**
+     * 药企ID
+     */
+    private String level1Id;
+
+    /**
+     * 药企ID
+     */
+    private String taskEntId;
+
+    /**
+     * 完成后可获得分
+     */
+    private String score;
+    /**
+     * 积分范围开始
+     */
+    private String taskScoreStart;
+    /**
+     * 积分范围结束
+     */
+    private String taskScoreEnd;
+    /**
+     * 组织机构ID
+     */
+    private String deptId;
+    /**
+     * 是否删除
+     */
+    private String delFlag;
+    /**
+     * 是否禁用
+     */
+    private String enableFlag;
+    /**
+     * 所属租户
+     */
+    private Integer tenantId;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 基础id
+     */
+    private String baseId;
+
+    private String realFlag;
+    /**
+     * 规则id
+     */
+    private String ruleId;
+
+    /**
+     * 父级id
+     */
+    private String parentId;
+
+    /**
+     * 任务备注
+     */
+    private String taskRemark;
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -82,15 +82,18 @@ public class SysImplementPlanManager {
         plan.setCreateTime(now);
         plan.setUpdateTime(now);
 
-        Long availScore;
         if (resource.getParentId() != 0){
 
-            availScore = implementPlanService.calcAvailScore(resource.getParentId(), resource.getPlanScore());
-
-        } else {
-           availScore = resource.getPlanScore();
+            Long availScore = implementPlanService.calcAvailScore(resource.getParentId(), resource.getPlanScore());
+            SysImplementPlan parentPlan = new SysImplementPlan();
+            parentPlan.setPlanId(resource.getParentId());
+            parentPlan.setAvailScore(availScore);
+            parentPlan.setUpdateBy(username);
+            parentPlan.setUpdateTime(now);
+            implementPlanService.updatePlan(parentPlan);
         }
-        plan.setAvailScore(availScore);
+
+        plan.setAvailScore(resource.getPlanScore());
 
         return implementPlanService.createPlan(plan);
     }
@@ -200,7 +203,7 @@ public class SysImplementPlanManager {
 
             // 获取计划详情
             SysImplPlanDetails one = implPlanDetailsService.getOne(Wrappers.<SysImplPlanDetails>lambdaQuery().eq(SysImplPlanDetails::getPlanId, record.getPlanId()));
-            p.setPlanDetailId(one != null ? one.getDetailsId() : null);
+            p.setPlanDetails(one);
 
             TreeNode<Integer> treeNode = new TreeNode<>();
             treeNode.setId(p.getPlanId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysImplementPlanService.java

@@ -47,5 +47,5 @@ public interface SysImplementPlanService extends IService<SysImplementPlan> {
      * @param planScore 目标值
      * @return 可用分
      */
-    Long calcAvailScore(Long planId, Long planScore);
+    Long calcAvailScore(Integer planId, Long planScore);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaHospitalService.java

@@ -18,37 +18,37 @@ import java.util.Map;
  */
 public interface WmDaHospitalService extends IService<WmDaHospital> {
 
-	public boolean saveOrUpdateHospitalByTask(WmTask wmTask);
+    boolean saveOrUpdateHospitalByTask(WmTask wmTask);
 
 
-	public List<WmDaHospital> listByPoint(WmDaHospital wmDaHospital);
+    List<WmDaHospital> listByPoint(WmDaHospital wmDaHospital);
 
-	public R approvalHospital(String taskId);
+    R approvalHospital(String taskId);
 
 
-	public R updateByApproval(Map<String,String> map);
+    R updateByApproval(Map<String, String> map);
 
-	/**
-	 * 手动处理调查信息入库
-	 *
-	 * @param map
-	 * @return
-	 */
-	R updateByApprovalForManualOperation(Map<String,String> map);
+    /**
+     * 手动处理调查信息入库
+     *
+     * @param map
+     * @return
+     */
+    R updateByApprovalForManualOperation(Map<String, String> map);
 
-	public Map<String,String> compareDictItem(String name, String str1, String str2, String param);
+    Map<String, String> compareDictItem(String name, String str1, String str2, String param);
 
-	/**
-	 * 初始化获取经纬度
-	 */
-	void parseAddress();
+    /**
+     * 初始化获取经纬度
+     */
+    void parseAddress();
 
-	/**
-	 * 批量导入
-	 *
-	 * @param excelModelList 医院列表
-	 * @return 结果
-	 */
-	Map<String, String> batchByExcel(List<BatchHospitalExcelModel> excelModelList);
+    /**
+     * 批量导入
+     *
+     * @param excelModelList 医院列表
+     * @return 结果
+     */
+    Map<String, String> batchByExcel(List<BatchHospitalExcelModel> excelModelList);
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysImplementPlanServiceImpl.java

@@ -73,7 +73,7 @@ public class SysImplementPlanServiceImpl extends ServiceImpl<SysImplementPlanMap
      * @return 可用分
      */
     @Override
-    public Long calcAvailScore(Long planId, Long planScore) {
+    public Long calcAvailScore(Integer planId, Long planScore) {
         SysImplementPlan plan = this.getById(planId);
 
         long availScore = plan.getAvailScore() - planScore;