需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -144,6 +144,15 @@ public class OrderBaseController {
         return ResponseHelper.success(orderBaseId);
     }
 
+    @ApiNotAuth
+    @PostMapping("/orderDetailJsmMiniOne")
+    @ApiOperation(value = "工单jsm")
+    public ResponseHelper<IPage<PgOrderBaseDetail>> orderDetailJsmMiniOne(@Valid @RequestBody JsmWorkerOrder jsmWorkerOrder){
+        IPage<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsmMiniOne(jsmWorkerOrder);
+        return ResponseHelper.success(orderBaseId);
+    }
+
+
 
     @PostMapping("/update")
     @ApiOperation(value = "修改工单")

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2380,8 +2380,58 @@ public class OrderBaseLogic {
                                 .or()
                 .eq(PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
                 )
-                .eq(CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && !StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
-                .eq(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getId,jsmWorkerOrder.getWorkerOrderIds())
+                .orderByDesc(PgOrderBase::getCreateTime)
+                .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+
+        List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
+
+        for (Object o : pgOrderBases.getRecords()) {
+
+            PgOrderBase pgOrderBase = (PgOrderBase) o;
+            PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
+
+            List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
+                    .notIn(PgOrderOperatorLog::getType,"异常反馈","其他","改约",
+                            "异常反馈","回访","费用申请单","费用申请单审核","待件"
+                            ,"拉修","不接电话","延误","质量信息")
+                    .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
+                    .orderByDesc(PgOrderOperatorLog::getId)
+                    .list();
+
+            List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery().eq(SettlementOrder::getWorkerOrderId, pgOrderBase.getId()).list();
+
+            List<SettlementOrderDetail> settlementOrderDetails = new ArrayList<>();
+            for (SettlementOrder settlementOrder : settlementOrderList) {
+                SettlementOrderDetail settlementOrderDetail = BeanUtil.toBean(settlementOrder, SettlementOrderDetail.class);
+
+                List<SettlementOrderItem> settlementOrderItems = settlementOrderItemService.lambdaQuery().eq(SettlementOrderItem::getSettlementOrderId, settlementOrder.getSettlementOrderId())
+                        .list();
+
+                settlementOrderDetail.setSettlementOrderItemList(settlementOrderItems);
+
+                settlementOrderDetails.add(settlementOrderDetail);
+            }
+            pgOrderBaseDetail.setPgOrderOperatorLogs(pgOrderOperatorLogs);
+            pgOrderBaseDetail.setSettlementOrderDetails(settlementOrderDetails);
+
+            pgOrderBaseDetails.add(pgOrderBaseDetail);
+
+            List<PgOrderProduct> pgOrderProducts = pgOrderProductService.lambdaQuery()
+                    .eq(PgOrderProduct::getOrderBaseId, pgOrderBase.getId())
+                    .list();
+
+            pgOrderBaseDetail.setPgOrderProducts(pgOrderProducts);
+
+        }
+        pgOrderBases.setRecords(pgOrderBaseDetails);
+        return pgOrderBases;
+    }
+
+    public IPage<PgOrderBaseDetail> orderDetailJsmMiniOne(JsmWorkerOrder jsmWorkerOrder) {
+
+
+        IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
+                 .in(PgOrderBase::getId,jsmWorkerOrder.getWorkerOrderIds())
                 .orderByDesc(PgOrderBase::getCreateTime)
                 .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));