Commit 4364d164 by huluobin

# 更新

parent a7db52e0
...@@ -23,6 +23,8 @@ public class ManageCostDto { ...@@ -23,6 +23,8 @@ public class ManageCostDto {
private String receiveCardUser; private String receiveCardUser;
// 理由/用途 // 理由/用途
private String reason; private String reason;
//备注
private String remark;
// 付款时间 // 付款时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
...@@ -37,6 +39,8 @@ public class ManageCostDto { ...@@ -37,6 +39,8 @@ public class ManageCostDto {
private Integer companyValue; private Integer companyValue;
// 付款主体 // 付款主体
private String companyName; private String companyName;
//会计科目
private String accountingSubjectName;
// 费用大类 // 费用大类
private String feeSuperType; private String feeSuperType;
// 费用小类 // 费用小类
......
...@@ -311,6 +311,8 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -311,6 +311,8 @@ public class CostApiServiceImpl implements CostApiService {
manageCostDto.setFeeSuperType(costDomain.getTypeName()); manageCostDto.setFeeSuperType(costDomain.getTypeName());
manageCostDto.setDepartmentName(costDomain.getPrimaryDepartmentName()); manageCostDto.setDepartmentName(costDomain.getPrimaryDepartmentName());
manageCostDto.setAccountingSubjectName(costDomain.getAccountingSubjectName());
manageCostDto.setRemark(costDomain.getCostRemark());
return manageCostDto; return manageCostDto;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment