|
|
@ -64,11 +64,7 @@ public class GroupDataServiceImpl implements GroupDataService { |
|
|
|
formDTO.setCustomerId(customerId); |
|
|
|
formDTO.setDateId(dateId); |
|
|
|
List<GridGroupTotalResultDTO> gridGroupTotalResultDTOS = groupDataDao.selectGridGroupTotal(formDTO); |
|
|
|
if (gridGroupTotalResultDTOS.size() == NumConstant.ZERO){ |
|
|
|
result.forEach(grid -> { |
|
|
|
grid.setGroupTotal(NumConstant.ZERO); |
|
|
|
}); |
|
|
|
}else { |
|
|
|
if (!CollectionUtils.isEmpty(gridGroupTotalResultDTOS)){ |
|
|
|
result.forEach(grid -> { |
|
|
|
gridGroupTotalResultDTOS.forEach(groupTotal -> { |
|
|
|
if (grid.getGridId().equals(groupTotal.getGridId())) { |
|
|
|