Pārlūkot izejas kodu

07 30 03 fix bugs

hr 4 gadi atpakaļ
vecāks
revīzija
b686ce5c14

+ 1 - 1
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, "用户未登录"),

+ 4 - 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;

+ 13 - 1
src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -194,7 +194,19 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.checkCode(dto.getResponsibilityCode(), hospId);
 
         Responsibility newResponsibility = BeanUtil.convertObj(dto, Responsibility.class);
-        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(System.currentTimeMillis()).setParentId(dto.getParentId());
+        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);
     }