# 更新

README.md

@@ -10,7 +10,7 @@
 - springboot 
 - mybatis
 - mybatis plus 
-- mysql 
+
 
 ### 1.3 云服务器
 正式环境：IP：193.112.167.175:22  ubuntu 密码：!@#blt*nix123  

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

@@ -64,5 +64,8 @@ public class CostTypeDomain {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "最后更新时间")
     private LocalDateTime lastUpdateTime;
+
+    @ApiModelProperty(value = "ns会计科目Id")
+    private Integer nsAccountingSubjectId;
 }
 

cost-service/src/main/java/com/blt/other/module/cost/controller/CostTypeController.java

@@ -16,6 +16,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+
+/**
+ * @author robbendev
+ */
 @Slf4j
 @Api(tags = "类型接口")
 @RestController

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CostTypeAddReq.java

@@ -30,4 +30,7 @@ public class CostTypeAddReq {
     @ApiModelProperty("是否管理成本")
     private Boolean isManageCost;
 
+    @ApiModelProperty(value = "ns会计科目Id")
+    private Integer nsAccountingSubjectId;
+
 }

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CostTypeModifyReq.java

@@ -32,4 +32,6 @@ public class CostTypeModifyReq {
     @ApiModelProperty("是否管理成本")
     private Boolean isManageCost;
 
+    @ApiModelProperty(value = "ns会计科目Id")
+    private Integer nsAccountingSubjectId;
 }

cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -267,6 +267,9 @@ public class CostDomain implements Serializable {
     @TableField(exist = false)
     private String departmentName;
 
+    @ApiModelProperty(value = "ns会计科目Id")
+    private Integer nsAccountingSubjectId;
+
 
     public void setCostType(CostTypeDomain costTypeDomain) {
 
@@ -280,6 +283,7 @@ public class CostDomain implements Serializable {
         this.setAccountingSubjectNo(accountingSubject.getSubjectNo());
 
         this.setIsManageCost(costTypeDomain.getIsManageCost());
+        this.setNsAccountingSubjectId(costTypeDomain.getNsAccountingSubjectId());
     }
 
     private static final String REGEX_CHINESE = "[\u4e00-\u9fa5]";// 中文正则

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

@@ -59,16 +59,38 @@ public interface CostTypeService extends IService<CostTypeDomain> {
      */
     CostTypeResult queryByNo(String typeNo);
 
+    /**
+     * 获取物流subjectCode
+     *
+     * @return rs
+     */
     GetLogisticsCodeResp getLogisticsCode();
 
-    //获取物流subjectCode
-    //获取物流银行帐号
+
+    /**
+     * 获取物流subjectCode
+     * 获取物流银行帐号
+     *
+     * @param subSupplierName 供应商名称
+     * @return res
+     */
     GetLogisticsBankResp getLogisticsBank(String subSupplierName);
 
-    //批量导入
+    /**
+     * 批量导入
+     *
+     * @param excel excel
+     * @throws IOException ex
+     */
     void importExcel(CostTypeImportExcelReq excel) throws IOException;
 
-    //导出
+    /**
+     * 导出
+     *
+     * @param response res
+     * @param req      re
+     * @throws IOException ex
+     */
     void exportExcel(HttpServletResponse response, CostTypeExportExcelReq req) throws IOException;
 
 }

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

@@ -64,6 +64,7 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
 
         costTypeDomain.setIsManageCost(req.getIsManageCost());
         costTypeDomain.setCostTemplateType(this.getCostTemplateType(req.getType()));
+        costTypeDomain.setNsAccountingSubjectId(req.getNsAccountingSubjectId());
 
         this.save(costTypeDomain);
 
@@ -78,6 +79,7 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
             lendCostTypeDomain.setTypeName(req.getTypeName());
             lendCostTypeDomain.setDescription(req.getDescription());
             lendCostTypeDomain.setAccountingSubjectId(lendAccountingSubject.getId());
+            lendCostTypeDomain.setNsAccountingSubjectId(req.getNsAccountingSubjectId());
 
             this.save(lendCostTypeDomain);
         }
@@ -102,6 +104,7 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
                     lendCostTypeDomain.setUpdateUser(oaUser.getUserName());
                     lendCostTypeDomain.setLastUpdateTime(LocalDateTime.now());
                     lendCostTypeDomain.setIsManageCost(req.getIsManageCost());
+                    lendCostTypeDomain.setNsAccountingSubjectId(req.getNsAccountingSubjectId());
 
                     this.updateById(lendCostTypeDomain);
                 }
@@ -112,6 +115,7 @@ public class CostTypeServiceImpl extends ServiceImpl<CostTypeDao, CostTypeDomain
             costTypeDomain.setDescription(req.getDescription());
             costTypeDomain.setUpdateUserId(oaUser.getOaUserId());
             costTypeDomain.setUpdateUser(oaUser.getUserName());
+            costTypeDomain.setNsAccountingSubjectId(req.getNsAccountingSubjectId());
 
             if (req.getAccountingSubjectId() != null) {
                 AccountingSubject accountingSubject = accountingSubjectMapper.selectById(req.getAccountingSubjectId());