Commit fe89a9f5 by huluobin

# update

parent 875aadc9
......@@ -13,6 +13,7 @@ import com.blt.other.module.cost.dto.request.AppCostRejectReq;
import com.blt.other.module.cost.model.CostDomain;
import com.blt.other.module.cost.service.AppCostService;
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 org.springframework.stereotype.Service;
......@@ -32,6 +33,8 @@ public class AppCostServiceImpl implements AppCostService {
@Resource
CostDao costDao;
@Resource
CostService costService;
@Resource
CostDetailService costDetailService;
......@@ -39,7 +42,10 @@ public class AppCostServiceImpl implements AppCostService {
public Page<CostDto> appCheckCostList(AppCheckCostListReq req) {
IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
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
......@@ -57,12 +63,13 @@ public class AppCostServiceImpl implements AppCostService {
@Override
public Page<CostDto> appCostList(AppCostListReq req) {
IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
costDetailService.setDetail(costDomainIPage.getRecords());
return (Page<CostDto>) costDao.appCostList(costDomainIPage, req).convert(CostDomain::castToDto);
Page<CostDomain> result = costDao.appCostList(costDomainIPage, req);
costDetailService.setDetail(result.getRecords());
return (Page<CostDto>) result.convert(CostDomain::castToDto);
}
private CostContext getCostState(String costNo, Integer oaUserId) {
CostDomain costDomain = costDao.selectByCostNo(costNo);
CostDomain costDomain = costService.getCostByCostNo(costNo);
CostState costState;
CostContext costContext;
switch (costDomain.getCostStatus()) {
......
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