From a9fcc6bba9759129c1d15eec15ab7b76b3d3e704 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 25 Sep 2022 23:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=AD=90?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderMasterController.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 815702e0..f725b0e9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -590,4 +590,36 @@ public class OrderMasterController extends BaseController { orderMasterService.cancelAgree(orderMasterId, agree); return AjaxResult.success(); } + + @PostMapping("/app/getDetailListByMasterId") + @ResponseBody + public AjaxResult getDetailListByMasterId(@RequestBody Long orderMasterId) { + try { + List orderStandardDetails = new ArrayList<>(); + List detailList = orderDetailService.selectByOrderMasterId(orderMasterId); + detailList.forEach(detail -> { + // 师傅信息 + Worker worker = workerService.selectById(detail.getWorkerId()); + + WorkerCertification workerRealInfo = null; + String workerName = ""; + if (worker != null) { + // 师傅实名信息 + workerRealInfo = workerCertificationService.selectByWorkerId(detail.getWorkerId()); + workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); + } + + OrderStandardDetail detailRes = new OrderStandardDetail(); + detailRes.setOrderDetailId(detail.getId()); + detailRes.setOrderDetailCode(detail.getCode()); + detailRes.setWorkerName(workerName); + detailRes.setRemark(workerName + "(" + detail.getCode() + ")"); + orderStandardDetails.add(detailRes); + }); + return AjaxResult.success(orderStandardDetails); + } catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); + } + } }