Commit 0d55b121 by huluobin

# update

parent 3ab3239c
...@@ -12,8 +12,8 @@ import com.blt.other.module.cost.dto.request.AppCostPassReq; ...@@ -12,8 +12,8 @@ import com.blt.other.module.cost.dto.request.AppCostPassReq;
import com.blt.other.module.cost.dto.request.AppCostRejectReq; import com.blt.other.module.cost.dto.request.AppCostRejectReq;
import com.blt.other.module.cost.model.CostDomain; import com.blt.other.module.cost.model.CostDomain;
import com.blt.other.module.cost.service.AppCostService; import com.blt.other.module.cost.service.AppCostService;
import com.blt.other.module.cost.service.CostService;
import com.blt.other.module.cost.service.CostDetailService; import com.blt.other.module.cost.service.CostDetailService;
import com.blt.other.module.cost.service.CostService;
import com.blt.other.module.cost.service.impl.costcheck.*; import com.blt.other.module.cost.service.impl.costcheck.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -42,7 +42,10 @@ public class AppCostServiceImpl implements AppCostService { ...@@ -42,7 +42,10 @@ public class AppCostServiceImpl implements AppCostService {
public Page<CostDto> appCheckCostList(AppCheckCostListReq req) { public Page<CostDto> appCheckCostList(AppCheckCostListReq req) {
IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize()); IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
costDetailService.setDetail(costDomainIPage.getRecords()); costDetailService.setDetail(costDomainIPage.getRecords());
return (Page<CostDto>) costDao.appCheckCostList(costDomainIPage, req).convert(CostDomain::castToDto);
Page<CostDomain> result = costDao.appCheckCostList(costDomainIPage, req);
costDetailService.setDetail(result.getRecords());
return (Page<CostDto>) result.convert(CostDomain::castToDto);
} }
@Override @Override
...@@ -60,8 +63,9 @@ public class AppCostServiceImpl implements AppCostService { ...@@ -60,8 +63,9 @@ public class AppCostServiceImpl implements AppCostService {
@Override @Override
public Page<CostDto> appCostList(AppCostListReq req) { public Page<CostDto> appCostList(AppCostListReq req) {
IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize()); IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
costDetailService.setDetail(costDomainIPage.getRecords()); Page<CostDomain> result = costDao.appCostList(costDomainIPage, req);
return (Page<CostDto>) costDao.appCostList(costDomainIPage, req).convert(CostDomain::castToDto); costDetailService.setDetail(result.getRecords());
return (Page<CostDto>) result.convert(CostDomain::castToDto);
} }
private CostContext getCostState(String costNo, Integer oaUserId) { private CostContext getCostState(String costNo, Integer oaUserId) {
......
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