Commit 0e62e1bf by huluobin

1、 cost/list/getCostDetail 这个接口需要返回这两个字段

2、cost/list/getAllCost 这个接口需要支持选多个项目一起查询,中间用逗号隔开
3、cost/list/reset/resetNoFile 这个接口增加保存项目和客户编号字段
4、推送到财务接口增加项目和客户编号字段推送,项目=ItemColumn,客户编号=CustomerCode
5、cost/list/reset/resetFile 这个接口增加保存项目和客户编号字段
parent 3b0a058b
...@@ -117,7 +117,11 @@ public class CostServiceImpl implements CostService { ...@@ -117,7 +117,11 @@ public class CostServiceImpl implements CostService {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<String> projectTypeList = Lists.newArrayList(projectTypes.split(",")).stream().filter(str -> !StringUtils.isEmpty(str)).collect(Collectors.toList());
List<String> projectTypeList = new ArrayList<>();
if (!StringUtils.isEmpty(projectTypes)) {
projectTypeList = Lists.newArrayList(projectTypes.split(",")).stream().filter(str -> !StringUtils.isEmpty(str)).collect(Collectors.toList());
}
List<CostDomain> costDomains = costDao.selectAll(userId, projectTypeList); List<CostDomain> costDomains = costDao.selectAll(userId, projectTypeList);
PageInfo<CostDomain> pageInfo = new PageInfo<>(costDomains); PageInfo<CostDomain> pageInfo = new PageInfo<>(costDomains);
......
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