diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index e8aaaf7..8c2e398 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1243,8 +1243,26 @@ public class ContractServiceImpl implements ContractService { queryReqVO.getElementName() ); - // 分页返回 - return new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); + // 分页返回结果 + PageResult results = new PageResult().setTotal(ipage.getTotal()).setList(ipage.getRecords()); + if (results.getTotal() > 0) { + results.getList().forEach(respVO -> { + // 基础系数配置 + List coefficientDOS = contractCoefficientMapper.selectList("FMU_ID", respVO.getId()); + respVO.setCoefficients(BeanUtils.toBean(coefficientDOS, CoefficientRespVO.class)); + // 品位等级价配置 + List gradeDOS = contractGradeMapper.selectList("FMU_ID", respVO.getId()); + respVO.setGrades(BeanUtils.toBean(gradeDOS, GradeRespVO.class)); + // 调整价配置 + List deductDOS = contractDeductMapper.selectList("FMU_ID", respVO.getId()); + respVO.setDeducts(BeanUtils.toBean(deductDOS, DeductRespVO.class)); + // 市场价配置 + List priceDOS = contractPriceMapper.selectList("FMU_ID", respVO.getId()); + respVO.setPrices(BeanUtils.toBean(priceDOS, PriceRespVO.class)); + }); + } + + return results; } @Override