From 724f82c0f937b53d5d02e4ed4120f5e773d34110 Mon Sep 17 00:00:00 2001 From: clunt Date: Mon, 26 Sep 2022 01:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BB=B7/=E5=94=AE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/AfterServiceRecordController.java | 3 +-- .../com/ghy/web/controller/order/OrderMasterController.java | 5 +++++ .../main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java index 0cc6bccd..4550f246 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java @@ -129,11 +129,10 @@ public class AfterServiceRecordController extends BaseController /** * 修改保存售后记录 */ - @RequiresPermissions("worker:record:edit") @Log(title = "售后记录", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(AfterServiceRecord afterServiceRecord) + public AjaxResult editSave(@RequestBody AfterServiceRecord afterServiceRecord) { return toAjax(afterServiceRecordService.updateAfterServiceRecord(afterServiceRecord)); } 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 f725b0e9..c4972ad2 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 @@ -370,6 +370,11 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setFinishImgList(finishImgList); orderStandardDetail.setRemark(orderDetail.getRemark()); + AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); + afterServiceRecord.setOrderDetailId(orderDetail.getId()); + List records =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); + orderStandardDetail.setAfterServiceRecordList(records); + orderStandardDetails.add(orderStandardDetail); }); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index 1362fde8..505c0728 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -1,5 +1,6 @@ package com.ghy.web.pojo.vo; +import com.ghy.order.domain.AfterServiceRecord; import lombok.Data; import java.util.Date; @@ -32,4 +33,6 @@ public class OrderStandardDetail { private List finishImgList; + private List afterServiceRecordList; + }