From cffb59531958e9ea7f33c8a05ecd0cbe208638e0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 9 Aug 2023 17:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inv/DeviceRepairOrderDetailController.java | 2 +-
 .../glxp/api/service/inv/DeviceRepairOrderDetailService.java  | 2 +-
 .../service/inv/impl/DeviceRepairOrderDetailServiceImpl.java  | 4 ++--
 .../api/service/inv/impl/DeviceRepairOrderServiceImpl.java    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java
index 454c57d73..6be387284 100644
--- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java
+++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java
@@ -42,7 +42,7 @@ public class DeviceRepairOrderDetailController {
     }
     @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk")
     public BaseResponse filterByorderIdFk(String  orderIdFk) {
-        DeviceRepairOrderDetailEntity detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk);
+        List<DeviceRepairOrderDetailEntity> detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk);
         return ResultVOUtils.success(detailEntity);
 
     }
diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java
index 2f027dac4..f76cd62c1 100644
--- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java
+++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java
@@ -11,7 +11,7 @@ public interface DeviceRepairOrderDetailService extends IService<DeviceRepairOrd
 
     List<DeviceRepairOrderDetailResponse> filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest);
 
-    DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk);
+    List<DeviceRepairOrderDetailEntity> filterByorderIdFk(String orderIdFk);
 
 
 
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java
index b997b1701..3bce47c36 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java
@@ -31,8 +31,8 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl<DeviceRepair
     }
 
     @Override
-    public DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk) {
-        return    deviceRepairOrderDetailMapper.selectOne(new QueryWrapper<DeviceRepairOrderDetailEntity>().eq("orderIdFk", orderIdFk));
+    public List<DeviceRepairOrderDetailEntity> filterByorderIdFk(String orderIdFk) {
+        return    deviceRepairOrderDetailMapper.selectList(new QueryWrapper<DeviceRepairOrderDetailEntity>().eq("orderIdFk", orderIdFk));
 
     }
 
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
index c21866001..4261ad0d1 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
@@ -82,7 +82,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime());
         deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage());
         deviceRepairOrderDao.insert(deviceRepairOrderEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(deviceRepairOrderEntity);
     }
 
     @Override
@@ -91,7 +91,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser");
         repairOrderEntity.setUpdateTime(new Date());
         deviceRepairOrderDao.updateById(repairOrderEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(repairOrderEntity);
     }
 
     @Override