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

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDetailDto.java

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

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java

@@ -21,6 +21,8 @@ public class CostDto {
     private String costNo;
     @ApiModelProperty("费用计划编号")
     private String costPlanNo;
+    @ApiModelProperty("体系")
+    private String companySystem;
     @ApiModelProperty("主体编号")
     private String companyNo;
     @ApiModelProperty("主体名称")
@@ -32,6 +34,8 @@ public class CostDto {
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
     @ApiModelProperty("类型类别")
     private String categoryName;
     @ApiModelProperty("费用类型描述")
@@ -53,6 +57,8 @@ public class CostDto {
     private String createUsername;
     @ApiModelProperty("费用单备注")
     private String costRemark;
+    @ApiModelProperty("内部备注")
+    private String innerRemark;
     @ApiModelProperty("创建时间")
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostPlanDto.java

@@ -10,15 +10,18 @@ import java.util.Date;
 public class CostPlanDto {
     private Integer id; // 费用单表 id
     private String costPlanNo; // 费用计划编号
+    private String companySystem; // 体系
     private String companyNo; // 主体编号
     private String companyName; // 主体名称
     private String typeNo; // 类型编号
     private String typeName; // 类型标题
+    private String typeInnerName; // 内部类型
 
     private Integer createUserid; // 创建人 id
     private String createUsercode; // 创建人编号
     private String createUsername; // 创建人名称
     private String costRemark; // 费用单备注
+    private String innerRemark; // 内部备注
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime; // 创建时间
     private String sonCostNo; // 关联子单

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostPlanTempDto.java

@@ -21,6 +21,7 @@ public class CostPlanTempDto {
 
     private String typeNo; // 大类编号
     private String typeNameDto; // 大类标题
+    private String typeInnerName; // 内部分类
     private String dic; // 币种
     private String project; // 所属项目
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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

@@ -33,6 +33,8 @@ public class CostPlanDomain implements Serializable {
     @ApiModelProperty("0 不抵扣个税  1 抵扣个税")
     private Integer isTax;
 
+    @ApiModelProperty("体系")
+    private String companySystem;
     @ApiModelProperty("公司主体value")
     private Integer companyValue;
     @ApiModelProperty("主体编号")
@@ -51,6 +53,8 @@ public class CostPlanDomain implements Serializable {
 //    @TableField(exist = false)
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
 
 
     @TableField(exist = false)
@@ -76,6 +80,8 @@ public class CostPlanDomain implements Serializable {
     private String costReason;
     @ApiModelProperty("费用单备注")
     private String costRemark;
+    @ApiModelProperty("内部备注")
+    private String innerRemark;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("创建时间")

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

@@ -48,6 +48,8 @@ public class CostPlanTempDomain {
     //    @TableField(exist = false)
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
 
 
     @TableField(exist = false)

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

@@ -41,6 +41,8 @@ public class CostTypeDomain {
     @ApiModelProperty("费用类型标题")
     private String typeName;
 
+    @ApiModelProperty("内部分类")
+    private String typeInnerName;
 
     private Integer accountingSubjectId;
 

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

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

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

@@ -88,6 +88,7 @@ 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());