# update

cost-service/src/main/java/com/blt/other/database/model/CostTypeDomain.java

 package com.blt.other.database.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -33,13 +32,11 @@ public class CostTypeDomain {
     @ApiModelProperty("费用类型标题")
     private String typeName;
 
-//    private String accountingSubjectNo;
 
     private Integer accountingSubjectId;
 
     private Boolean isManageCost;
     private String accountingSubjectNo;
-    private Integer accountingSubjectId;
 
     /**
      * 形如0b1001 四位二进制

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostTypeServiceImpl.java

@@ -20,7 +20,6 @@ import com.blt.other.module.cost.dto.response.GetLogisticsBankResp;
 import com.blt.other.module.cost.dto.response.GetLogisticsCodeResp;
 import com.blt.other.module.cost.model.AccountingSubject;
 import com.blt.other.module.cost.service.CostTypeKindService;
-import com.blt.other.module.cost.model.AccountingSubject;
 import com.blt.other.module.cost.service.CostTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -43,20 +42,16 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
 
     @Override
     public void addCostType(CostTypeAddReq req) {
-
-        AccountingSubject accountingSubject = accountingSubjectMapper.selectByNo(req.getAccountingSubjectNo());
-
         CostTypeDomain costTypeDomain = new CostTypeDomain();
 
         AccountingSubject accountingSubject = accountingSubjectMapper.selectById(req.getAccountingSubjectId());
-        costTypeDomain.setAccountingSubjectId(accountingSubject.getId());
+        costTypeDomain.setAccountingSubjectNo(accountingSubject.getSubjectNo());
         costTypeDomain.setTypeNo(IdWorker.getIdStr());
         costTypeDomain.setTypeName(req.getTypeName());
         costTypeDomain.setDescription(req.getDescription());
         costTypeDomain.setAccountingSubjectId(accountingSubject.getId());
 
         costTypeDomain.setIsManageCost(req.getIsManageCost());
-
         costTypeDomain.setCostTemplateType(this.getCostTemplateType(req.getType()));
 
         this.save(costTypeDomain);
@@ -67,13 +62,13 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
 
             CostTypeDomain lendCostTypeDomain = new CostTypeDomain();
             lendCostTypeDomain.setCostTemplateType(CostTypeDomain.borrow);
-            lendCostTypeDomain.setAccountingSubjectId(43);
             lendCostTypeDomain.setAccountingSubjectNo(lendAccountingSubject.getSubjectNo());
             lendCostTypeDomain.setTypeNo(IdWorker.getIdStr());
             lendCostTypeDomain.setTypeName(req.getTypeName());
             lendCostTypeDomain.setDescription(req.getDescription());
-            this.save(lendCostTypeDomain);
             lendCostTypeDomain.setAccountingSubjectId(lendAccountingSubject.getId());
+
+            this.save(lendCostTypeDomain);
         }
 
     }
@@ -103,10 +98,8 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
                 lendCostTypeDomain.setUpdateUserId(oaUser.getOaUserId());
                 lendCostTypeDomain.setUpdateUser(oaUser.getUserName());
                 lendCostTypeDomain.setLastUpdateTime(LocalDateTime.now());
-                if (req.getAccountingSubjectId() != null) {
-                    lendCostTypeDomain.setAccountingSubjectId(req.getAccountingSubjectId());
-                }
                 lendCostTypeDomain.setIsManageCost(req.getIsManageCost());
+
                 this.updateById(lendCostTypeDomain);
             }