|
@@ -1039,6 +1039,17 @@ public class OrderBaseEsLogic {
|
|
|
.eq(WorkerOrder::getPayStatus, MaterialExamineStatusEnum.PAID.getKey())
|
|
|
.select(WorkerOrder::getWorkerOrderId, WorkerOrder::getTotalAmount).list();
|
|
|
|
|
|
+ List<OperatorLogBean> operatorList = null;
|
|
|
+ if (CollectionUtil.isNotEmpty(orderBaseIds)) {
|
|
|
+ operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<String, List<OperatorLogBean>> operatorMap = null;
|
|
|
+ if (CollectionUtil.isNotEmpty(operatorList)) {
|
|
|
+ operatorMap = operatorList.stream()
|
|
|
+ .collect(Collectors.groupingBy(OperatorLogBean::getOrderBaseId));
|
|
|
+ }
|
|
|
+
|
|
|
for (OrderBaseVO orderBaseVO : orderBaseVOS1) {
|
|
|
|
|
|
List<WorkerOrder> workerOrders = workerOrderList.stream()
|
|
@@ -1048,6 +1059,9 @@ public class OrderBaseEsLogic {
|
|
|
orderBaseVO.setWorkerPrice(bigDecimal);
|
|
|
}
|
|
|
|
|
|
+ if (Objects.nonNull(operatorMap) && operatorMap.containsKey(orderBaseVO.getId())) {
|
|
|
+ orderBaseVO.setLastFeedbackRecord(operatorMap.get(orderBaseVO.getId()).get(0).getContent());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return orderBaseVOS1;
|