Commit cf6a67e8 by huluobin

# 更新

parent e37fc97d
...@@ -43,9 +43,18 @@ public interface CostApi { ...@@ -43,9 +43,18 @@ public interface CostApi {
@GetMapping("/cost/api/type/{costNo}") @GetMapping("/cost/api/type/{costNo}")
CostResult<String> getTypeName(@PathVariable("costNo") String costNo); CostResult<String> getTypeName(@PathVariable("costNo") String costNo);
/**
* 获取费用系统列表
*
* @param startDate 开始时间
* @param endDate 结束时间
* @param pageNum 分页
* @param pageSize 分页
* @return res
*/
@ApiOperation("获取费用系统列表") @ApiOperation("获取费用系统列表")
@GetMapping({"/cost/api/getCostList"}) @GetMapping({"/cost/api/getCostList"})
CostResult<List<CostDto>> getCostList(@RequestParam(name = "startDate") String stKartDate, CostResult<List<CostDto>> getCostList(@RequestParam(name = "startDate") String startDate,
@RequestParam(name = "endDate") String endDate, @RequestParam(name = "endDate") String endDate,
@RequestParam(name = "pageNum") Integer pageNum, @RequestParam(name = "pageNum") Integer pageNum,
@RequestParam(name = "pageSize") Integer pageSize); @RequestParam(name = "pageSize") Integer pageSize);
......
...@@ -230,7 +230,6 @@ public class CostDto { ...@@ -230,7 +230,6 @@ public class CostDto {
@TableField(exist = false) @TableField(exist = false)
private List<CostDetailDto> costDetailList; private List<CostDetailDto> costDetailList;
@TableField(exist = false)
private Boolean isManageCost; private Boolean isManageCost;
} }
...@@ -86,8 +86,9 @@ public class CostDomain implements Serializable { ...@@ -86,8 +86,9 @@ public class CostDomain implements Serializable {
private String typeNo; private String typeNo;
@ApiModelProperty("类型标题") @ApiModelProperty("类型标题")
private String typeName; private String typeName;
@ApiModelProperty("是否管理成本") @ApiModelProperty("是否管理成本")
private Integer isManageCost; private Boolean isManageCost;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("描述") @ApiModelProperty("描述")
...@@ -274,6 +275,8 @@ public class CostDomain implements Serializable { ...@@ -274,6 +275,8 @@ public class CostDomain implements Serializable {
AccountingSubject accountingSubject = accountingSubjectMapper.selectById(costTypeDomain.getAccountingSubjectId()); AccountingSubject accountingSubject = accountingSubjectMapper.selectById(costTypeDomain.getAccountingSubjectId());
this.setAccountingSubjectName(accountingSubject.getName()); this.setAccountingSubjectName(accountingSubject.getName());
this.setAccountingSubjectNo(accountingSubject.getSubjectNo()); this.setAccountingSubjectNo(accountingSubject.getSubjectNo());
this.setIsManageCost(costTypeDomain.getIsManageCost())
} }
private static final String REGEX_CHINESE = "[\u4e00-\u9fa5]";// 中文正则 private static final String REGEX_CHINESE = "[\u4e00-\u9fa5]";// 中文正则
......
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