Merge branch 'master' of huangrui/CostAccount into dev

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

@@ -37,9 +37,9 @@ public class AfterAllocationVO {
     @ApiModelProperty(name = "responsibilityName", value = "责任中心名称")
     private String responsibilityName;
 
-    private String accountCode;
+    private String accountingCode;
 
-    private String accountName;
+    private String accountingName;
 
 
     /**

src/main/java/com/imed/costaccount/service/ResponsibilityService.java

@@ -101,6 +101,6 @@ public interface ResponsibilityService extends IService<Responsibility> {
      */
     String getByCode(String valueResponsibilityCode, Long hospId);
 
-    Integer getByLevelId(String responsibilityCode, Long hospId);
+    Long getByLevelId(String responsibilityCode, Long hospId);
 }
 

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

@@ -253,7 +253,7 @@ public class AllocationServiceImpl extends ServiceImpl<AllocationMapper, Allocat
         costingGroups.forEach(i -> {
             AllocationQuery allocationQuery = new AllocationQuery();
             String responsibilityCode = i.getResponsibilityCode();
-            Integer levelId = responsibilityService.getByLevelId(responsibilityCode, hospId);
+            Long levelId = responsibilityService.getByLevelId(responsibilityCode, hospId);
             if (Objects.isNull(levelId)) {
                 throw new CostException("责任中心" + i.getResponsibilityName() + "数据异常");
             }

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

@@ -522,7 +522,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     }
 
     @Override
-    public Integer getByLevelId(String responsibilityCode, Long hospId) {
+    public Long getByLevelId(String responsibilityCode, Long hospId) {
         Responsibility one = this.getOne(
                 new LambdaQueryWrapper<Responsibility>()
                         .eq(Responsibility::getResponsibilityCode, responsibilityCode)
@@ -532,6 +532,6 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         if (Objects.isNull(one)) {
             throw new CostException("数据异常");
         }
-        return one.getShareLevel();
+        return one.getShareId();
     }
 }