浏览代码

添加别名

ljx 4 年之前
父节点
当前提交
ef649a43ce

+ 4 - 0
src/main/java/com/imed/costaccount/model/CostAccountShare.java

@@ -67,6 +67,10 @@ public class CostAccountShare implements Serializable {
 	 */
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String paramList;
+	/**
+	 * 别名
+	 */
+	private String alias;
 	/**
 	 * 是否包含分摊参数成本
 	 */

+ 4 - 0
src/main/java/com/imed/costaccount/model/dto/CostAccountShareEditDto.java

@@ -42,6 +42,10 @@ public class CostAccountShareEditDto {
 
     @ApiModelProperty(name = "costNode",value = "备注")
     private String costNode;
+    /**
+     * 别名
+     */
+    private String alias;
     /**
      * 是否包含分摊成本 0不包含 1 包含
      */

+ 4 - 0
src/main/java/com/imed/costaccount/model/dto/CostAccountShareSaveDto.java

@@ -39,6 +39,10 @@ public class CostAccountShareSaveDto {
 
     @ApiModelProperty(name = "costNode",value = "备注")
     private String costNode;
+    /**
+     * 别名
+     */
+    private String alias;
     /**
      * 是否包含分摊成本 0不包含 1 包含
      */

+ 4 - 0
src/main/java/com/imed/costaccount/model/vo/CostAccountShareVO.java

@@ -50,5 +50,9 @@ public class CostAccountShareVO {
      * 是否包含分摊参数成本
      */
     private Integer isShareCost;
+    /**
+     * 别名
+     */
+    private String alias;
     private String allParentIds;
 }

+ 7 - 7
src/main/java/com/imed/costaccount/service/impl/CostAccountShareServiceImpl.java

@@ -204,7 +204,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
     }
 
     /**
-     * 修改成本中心责任对照
+     * 修改成本分摊参数对应
      *
      * @param costAccountShareEditDto
      */
@@ -401,13 +401,13 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
                 .eq(CostShareLevel::getHospId, hospId).eq(CostShareLevel::getCalcType, calcType))
                 .stream().map(CostShareLevel::getId).distinct().collect(Collectors.toList());
         String accountingIds = costAccountShare.getAccountingIds();
-        List<Long> responsibilityIdList=null;
-        if (StrUtil.isNotBlank(accountingIds)){
-            List<String> accountIdList = Arrays.asList(accountingIds.split(StrUtil.COMMA));
-            responsibilityIdList= baseMapper.getResponsibilityIdsByAccountId(accountIdList);
-        }
+//        List<Long> responsibilityIdList=null;
+//        if (StrUtil.isNotBlank(accountingIds)){
+//            List<String> accountIdList = Arrays.asList(accountingIds.split(StrUtil.COMMA));
+//            responsibilityIdList= baseMapper.getResponsibilityIdsByAccountId(accountIdList);
+//        }
         // 筛选指定类型的责任中心 并且当前没有设置的责任中心
-        List<Long> finalResponsibilityIdList = responsibilityIdList;
+//        List<Long> finalResponsibilityIdList = responsibilityIdList;
         List<Responsibility> responsibilityList = responsibilityService.list(new QueryWrapper<Responsibility>().lambda()
                 .eq(Responsibility::getHospId, hospId)
                 .ne(Responsibility::getShareId,NumberConstant.ZERO))

+ 1 - 0
src/main/resources/mapper/CostAccountShareMapper.xml

@@ -15,6 +15,7 @@
         <result property="accountingNames" column="accounting_names"/>
         <result property="accountingCodes" column="accounting_codes"/>
         <result property="paramList" column="param_list"/>
+        <result property="alias" column="alias"/>
         <result property="isShareCost" column="is_share_cost"/>
         <result property="costNode" column="cost_node"/>
         <result property="createTime" column="create_time"/>