diff --git a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java index c0fe0823f..d3ee102d7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java @@ -69,14 +69,14 @@ public class BasicDestinyRelController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicSkProjectResponses = basicSkProjectService.filterList(basicSkProjectRequest); - if (CollectionUtil.isNotEmpty(basicSkProjectResponses)) { - List pId = basicSkProjectResponses.stream().map(BasicSkProjectResponse::getId).collect(Collectors.toList()); - Map priceMap = basicDestinyRelService.sumPriceByRedIds(pId); - basicSkProjectResponses.forEach(x -> { - BigDecimal price = priceMap.get(x.getId()); - x.setPrice(String.valueOf(price)); - }); - } +// if (CollectionUtil.isNotEmpty(basicSkProjectResponses)) { +// List pId = basicSkProjectResponses.stream().map(BasicSkProjectResponse::getId).collect(Collectors.toList()); +// Map priceMap = basicDestinyRelService.sumPriceByRedIds(pId); +// basicSkProjectResponses.forEach(x -> { +// BigDecimal price = priceMap.get(x.getId()); +// x.setPrice(String.valueOf(price)); +// }); +// } PageInfo pageInfo = new PageInfo<>(basicSkProjectResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 24a3c185a..7e6637271 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -4,7 +4,7 @@ - + @@ -226,13 +226,14 @@ where code = #{code} - select awb.id, awb.code, awb.action, bbt.name from auth_warehouse_bustype awb - inner join basic_bussiness_type bbt on awb.action = bbt.action + inner join basic_bussiness_type bbt on awb.action = bbt.action AND awb.code = #{subInvCode} @@ -241,6 +242,7 @@ AND enable = #{enable} + group by awb.action