Commit 87c7a11b by huluobin

update

parent 8884f294
......@@ -22,6 +22,7 @@ public interface CostService {
// @Deprecated
Integer saveNewCost(CostDomain costDomain);
void setPrimaryDepartment(List<CostDomain> costDomains);
/**
* 获取所有费用单
*
......
......@@ -34,6 +34,7 @@ public class CostListSearchServiceImpl implements CostListSearchService {
CostApiDto.GetByKeyResp resp = new CostApiDto.GetByKeyResp();
PageHelper.startPage(pageNum, pageSize);
List<CostDomain> costDomains = costListSearchDao.selectByKey(Lists.newArrayList(key.split(",")).stream().filter(Objects::nonNull).collect(Collectors.toList()));
costService.setPrimaryDepartment(costDomains);
List<CostDto> dtos = costDomains.stream().map(CostDomain::castToDto).collect(Collectors.toList());
PageInfo<CostDomain> pageInfo = new PageInfo<>(costDomains);
......@@ -49,7 +50,7 @@ public class CostListSearchServiceImpl implements CostListSearchService {
PageHelper.startPage(searchKeysVo.getParams().getPageNum(), searchKeysVo.getParams().getPageSize());
List<CostDomain> domains = costListSearchDao.selectByKeys(searchKeysVo);
costService.setPrimaryDepartment(domains);
PageInfo<CostDomain> pageInfo = new PageInfo<>(domains);
if (null != searchKeysVo.getParams().getKeys().getLinkCost() && !searchKeysVo.getParams().getKeys().getLinkCost().isEmpty()) {
List<CostDomain> list = new ArrayList<>();
......
......@@ -199,7 +199,6 @@ public abstract class AbstractCostService implements CostService {
}
}
@Override
public List<CostDto> getByCostPlanNo(String costPlanNo) {
return costDao.selectByCostPlanNo(costPlanNo)
......
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