Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/enums/ErrorCodeEnum.java

@@ -1,7 +1,7 @@
 package com.imed.costaccount.enums;
 
 public enum ErrorCodeEnum {
-    DATA_NOT_EXIST(500, "数据不存在"),
+    DATA_NOT_EXIST(500, "数据不存在或已被移除"),
     USER_NOT_EXIST(500, "用户不存在"),
     USER_PASS_FALSE(500, "用户名或密码错误"),
     USER_NOT_LOGIN(401, "用户未登录"),

src/main/java/com/imed/costaccount/model/Responsibility.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 责任中心表
  * 
@@ -60,6 +58,10 @@ public class Responsibility implements Serializable {
 	 * 责任类型 1. 收费中心，2.成本(费用)中心
 	 */
 	private Integer responsibilityType;
+	/**
+	 * 分摊级别的Id
+	 */
+	private Integer shareId;
 	/**
 	 * 分摊级别 如果是顶层默认为0
 	 */

src/main/java/com/imed/costaccount/model/dto/ResponsibilityEditDTO.java

@@ -35,6 +35,10 @@ public class ResponsibilityEditDTO {
     @ApiModelProperty(name = "responsibilityType",value = "收益类型 1. 收费中心，2.成本(费用)中心")
     private Integer responsibilityType;
 
+    @NotNull(message = "分摊级别id不能为空")
+    @ApiModelProperty(name = "shareLevelId",value = "分摊级别id")
+    private Integer shareLevelId;
+
     @NotNull(message = "分摊级别不能为空")
     @ApiModelProperty(name = "shareLevel",value = "分摊级别（分摊接口中获取，暂时可写死）")
     private Integer shareLevel;

src/main/java/com/imed/costaccount/model/dto/ResponsibilitySaveDTO.java

@@ -31,6 +31,9 @@ public class ResponsibilitySaveDTO {
     @ApiModelProperty(name = "responsibilityType",value = "收益类型 1. 收费中心，2.成本(费用)中心")
     private Integer responsibilityType;
 
+    @ApiModelProperty(name = "shareId",value = "分摊级别的Id")
+    private Integer shareId;
+
 //    @NotNull(message = "分摊级别不能为空")
     @ApiModelProperty(name = "shareLevel",value = "分摊级别（分摊接口中获取，暂时可写死）")
     private Integer shareLevel;

src/main/java/com/imed/costaccount/model/vo/CostResponsibilityVO.java

@@ -40,7 +40,6 @@ public class CostResponsibilityVO{
     @ApiModelProperty(name = "shareName",value = "分摊级别名称")
     private String shareName;
 
-    @JsonIgnore
     private Integer parentId;
 
     /**

src/main/java/com/imed/costaccount/service/impl/DepartmentServiceImpl.java

@@ -97,7 +97,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         Map<String, List<Department>> map =
                 departmentList.stream().collect(Collectors.groupingBy(Department::getDepartmentCode));
         if (!CollectionUtils.isEmpty(map.get(departmentRequest.getDepartmentCode()))){
-            throw new CostException(500,"代码"+departmentRequest.getDepartmentCode()+"已存在");
+            throw new CostException(500,"科室代码"+departmentRequest.getDepartmentCode()+"已存在");
         }
         departmentRequest.setHospId(hospId);
         Department department = BeanUtil.convertObj(departmentRequest, Department.class);

src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -45,7 +45,6 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     public PageUtils queryList(Integer current, Integer pageSize, Integer hospId, String name) {
         Page<Hospital> hosptailPage = new Page<>(current, pageSize);
         Page<Hospital> pages = this.page(hosptailPage, new QueryWrapper<Hospital>().lambda()
-//                .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
                 .like(!StringUtils.isEmpty(name), Hospital::getName, name));
         List<Hospital> records = pages.getRecords();
         List<HospitalVO> hospitalVOList = BeanUtil.convertList(records, HospitalVO.class);

src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -58,6 +58,9 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
 
         parentCostResponsibility.forEach(i -> costResponsibilityVOS.forEach(j -> {
             if (j.getParentId().equals(i.getId())) {
+                if (i.getResponsibilityLevel() == 1) {
+                    i.setShareLevel(null);
+                }
                 List<CostResponsibilityVO> child = i.getChild();
                 if (CollUtil.isEmpty(child)) {
                     child = new ArrayList<>();
@@ -66,11 +69,6 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
                 i.setChild(child);
             }
         }));
-        parentCostResponsibility.forEach(i -> {
-            if (NumberConstant.ZERO.equals(i.getParentId())) {
-                i.setShareLevel(null);
-            }
-        });
         return parentCostResponsibility;
     }
 
@@ -194,9 +192,21 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.removeById(id);
 
         this.checkCode(dto.getResponsibilityCode(), hospId);
-        // 新增父节点数据
+
         Responsibility newResponsibility = BeanUtil.convertObj(dto, Responsibility.class);
-        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime()).setResponsibilityLevel(1);
+        newResponsibility.setId(null)
+                .setHospId(responsibility.getHospId())
+                .setCreateTime(System.currentTimeMillis())
+                .setParentId(dto.getParentId())
+                .setResponsibilityLevel(2);
+        // 暂时先这样处理
+        if (dto.getIsGatherCenter() == 1) {
+            newResponsibility.setShareId(null)
+                    .setShareLevel(0)
+                    .setShareName(null)
+                    .setParentId(0)
+                    .setResponsibilityLevel(1);
+        }
         this.save(newResponsibility);
     }
 

src/main/resources/mapper/ResponsibilityMapper.xml

@@ -13,6 +13,7 @@
         <result property="hospId" column="hosp_id"/>
         <result property="isGatherCenter" column="is_gather_center"/>
         <result property="responsibilityType" column="responsibility_type"/>
+        <result property="shareId" column="share_id"/>
         <result property="shareLevel" column="share_level"/>
         <result property="shareName" column="share_name"/>
         <result property="createTime" column="create_time"/>