|
|
@@ -688,6 +688,24 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
|
|
|
return boilerTaskOrderRespVO;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public BoilerTaskOrderRespVO getBoilerTaskOrderForAPP(String id) {
|
|
|
+ BoilerTaskOrderRespVO boilerTaskOrderRespVO = getBoilerTaskOrder(id);
|
|
|
+ List<BoilerTaskOrderItemDetailVO> orderItems = boilerTaskOrderRespVO.getOrderItems();
|
|
|
+ Map<String, List<BoilerTaskOrderItemDetailVO>> mainCheckerIdToOrderItemsMap = orderItems.stream().collect(Collectors.groupingBy(BoilerTaskOrderItemDetailVO::getMainChecker));
|
|
|
+ Map<String, AdminUserRespDTO> userIdToEntityMap = adminUserApi.getUserMap(mainCheckerIdToOrderItemsMap.keySet());
|
|
|
+ for (Map.Entry<String, AdminUserRespDTO> userIdToEntityEntry : userIdToEntityMap.entrySet()) {
|
|
|
+ String mainCheckerId = userIdToEntityEntry.getKey();
|
|
|
+ AdminUserRespDTO mainCheckerUser = userIdToEntityEntry.getValue();
|
|
|
+ List<BoilerTaskOrderItemDetailVO> boilerTaskOrderItemDetailVOS = mainCheckerIdToOrderItemsMap.get(mainCheckerId);
|
|
|
+ boilerTaskOrderItemDetailVOS = boilerTaskOrderItemDetailVOS != null ? boilerTaskOrderItemDetailVOS : Collections.emptyList();
|
|
|
+ for (BoilerTaskOrderItemDetailVO boilerTaskOrderItemDetailVO : boilerTaskOrderItemDetailVOS) {
|
|
|
+ boilerTaskOrderItemDetailVO.setMainCheckerUser(mainCheckerUser);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return boilerTaskOrderRespVO;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public PageResult<BoilerTaskOrderRespVO> getBoilerTaskOrderPage(BoilerTaskOrderPageReqVO pageReqVO) {
|
|
|
|