# update

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

@@ -26,16 +26,22 @@ public class CostDto {
     @ApiModelProperty("主体名称")
     private String companyName;
 
+
+    private Integer typeId;
     @ApiModelProperty("类型编号")
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+    @ApiModelProperty("费用类型描述")
+    private String description;
 
+    private Integer accountingSubjectId;
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectNo;
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectName;
 
+
     @ApiModelProperty("创建人id")
     private Integer createUserid;
     @Deprecated

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

@@ -29,7 +29,9 @@ public class CostDetailDomain {
     @TableField(exist = false)
     @ApiModelProperty("类型标题")
     private String typeName;
-
+    @TableField(exist = false)
+    @ApiModelProperty("描述")
+    private String description;
 
     private Integer accountingSubjectId;
     @TableField(exist = false)

cost-service/src/main/resources/mapper/CostDetailMapper.xml

@@ -8,7 +8,8 @@
                ifnull(ct.type_no, 0)       type_no,
                ifnull(ct.type_name, '待补充') type_name,
                ifnull(ast.subject_no, 0)   accounting_subject_no,
-               ifnull(ast.name, '待补充')     accounting_subject_name
+               ifnull(ast.name, '待补充')     accounting_subject_name,
+               ct.description
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -20,7 +21,8 @@
                ifnull(ct.type_no, 0)       type_no,
                ifnull(ct.type_name, '待补充') type_name,
                ifnull(ast.subject_no, 0)   accounting_subject_no,
-               ifnull(ast.name, '待补充')     accounting_subject_name
+               ifnull(ast.name, '待补充')     accounting_subject_name,
+               ct.description
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id