新增体系,内部备注,内部分类

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

@@ -44,6 +44,9 @@ public class ResetItemReq {
     @ApiModelProperty("费用类型编号")
     private String typeNo; // 大类编号
 
+    @ApiModelProperty("内部分类")
+    private String typeInnerName; // 内部分类
+
     @ApiModelProperty("所属项目")
     private String project; // 所属项目
 

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

@@ -29,6 +29,8 @@ public class ResetReq {
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectNo;
     @ApiModelProperty("会计一级科目")

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

@@ -31,6 +31,8 @@ public class CostDetailDomain {
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
     @ApiModelProperty("类型类别")
     private String categoryName;
 

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

@@ -76,6 +76,8 @@ public class CostDomain implements Serializable {
     private Integer costDepartmentId;
 
 
+    @ApiModelProperty("体系")
+    private String companySystem;
     @ApiModelProperty("主体编号")
     private String companyNo;
     @ApiModelProperty("主体名称")
@@ -88,6 +90,8 @@ public class CostDomain implements Serializable {
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
     @ApiModelProperty("类型类别")
     private String categoryName;
 
@@ -116,6 +120,8 @@ public class CostDomain implements Serializable {
 
     @ApiModelProperty("费用单备注")
     private String costRemark;
+    @ApiModelProperty("内部备注")
+    private String innerRemark;
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;

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

@@ -88,7 +88,6 @@ public class CostPlanTempServiceImpl implements CostPlanTempService {
         costPlanTempDomain.setTypeId(costTypeDomain.getId());
         costPlanTempDomain.setTypeNo(costTypeDomain.getTypeNo());
         costPlanTempDomain.setTypeName(costTypeDomain.getTypeName());
-        costPlanTempDomain.setTypeInnerName(costTypeDomain.getTypeInnerName());
 
         AccountingSubject accountingSubject = accountingSubjectMapper.selectById(costTypeDomain.getAccountingSubjectId());