修改成本分摊的数据

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

@@ -57,11 +57,11 @@ public class CostCostingCollection implements Serializable {
 	/**
 	 * 分摊层级代码
 	 */
-	private String shareParamCode;
+	private Integer leverSort;
 	/**
 	 * 分摊层级名称
 	 */
-	private String shareParamName;
+	private String shareLevelName;
 	/**
 	 * 成本项目代码
 	 */
@@ -73,7 +73,7 @@ public class CostCostingCollection implements Serializable {
 	/**
 	 * 是否固定成本 0.不是，1.是
 	 */
-	private Integer isDirectIncome;
+	private Integer isBaseCost;
 	/**
 	 * 金额
 	 */

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.mapper.AccountingMapper;
 import com.imed.costaccount.mapper.AccountingProductMapper;
 import com.imed.costaccount.mapper.ProductMapper;
@@ -123,17 +124,16 @@ public class AccountingProductServiceImpl extends ServiceImpl<AccountingProductM
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void saveAccountProduct(AccountProductSaveDTO accountProductSaveDTO, User user) {
-        // TODO: 2021/8/4  校验这个 会计科目是否能绑定数据
         Long accountId = accountProductSaveDTO.getId();
         // 删除所有原来的关系
         this.remove(new LambdaQueryWrapper<AccountingProduct>().eq(AccountingProduct::getAccountingId, accountId));
-
+        Long hospId = UserContext.getHospId();
         List<Long> products = accountProductSaveDTO.getProducts();
         List<AccountingProduct> accountingProducts = products.stream().map(i -> {
             AccountingProduct accountingProduct = new AccountingProduct();
             accountingProduct.setAccountingId(accountId)
                     .setProductId(i)
-                    .setHospId(user.getHospId())
+                    .setHospId(hospId)
                     .setCreateTime(System.currentTimeMillis());
             return accountingProduct;
         }).collect(Collectors.toList());

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

@@ -122,7 +122,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                 sum = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                 i.setAmount(sum);
             }
-            //TODO 统计总金额
             totalAmount.updateAndGet(v -> v.add(i.getAmount()));
         });
         PageUtils pageUtils = new PageUtils(pages);

src/main/resources/mapper/CostCostingCollectionMapper.xml

@@ -12,11 +12,11 @@
         <result property="departmentName" column="department_name"/>
         <result property="responsibilityCode" column="responsibility_code"/>
         <result property="responsibilityName" column="responsibility_name"/>
-        <result property="shareParamCode" column="share_param_code"/>
-        <result property="shareParamName" column="share_param_name"/>
+        <result property="leverSort" column="lever_sort"/>
+        <result property="shareLevelName" column="share_level_name"/>
         <result property="productCode" column="product_code"/>
         <result property="productName" column="product_name"/>
-        <result property="isDirectIncome" column="is_direct_income"/>
+        <result property="isBaseCost" column="is_base_cost"/>
         <result property="amount" column="amount"/>
         <result property="fileId" column="file_id"/>
         <result property="createTime" column="create_time"/>