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; + }