07 30 02 fix bugs

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/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,9 @@ 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());
         this.save(newResponsibility);
     }