From 098da1241b65aac14f2d1233c0a20befa039a228 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 23 Dec 2022 20:22:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E5=85=BB?=
 =?UTF-8?q?=E6=8A=A4=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=9C=AA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../req/inventory/FilterDeviceCollectOrderDetailRequest.java | 5 +++++
 .../service/inventory/impl/DeviceMAOrderServiceImpl.java     | 1 +
 .../mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java
index c02c852f..2059fc07 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java
@@ -39,4 +39,9 @@ public class FilterDeviceCollectOrderDetailRequest extends ListPageRequest {
      */
     private String collectUser;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
index 3d5500f9..93d8de8d 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
@@ -158,6 +158,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
         detailEntity.setSerialNo(deviceCollectOrderDetail.getSerialNo());
         detailEntity.setMaintenanceStatus(addDeviceMAOrderRequest.getMaintenanceStatus());
         detailEntity.setDeviceStatus(addDeviceMAOrderRequest.getDeviceStatus());
+        detailEntity.setRemark(addDeviceMAOrderRequest.getRemark());
 
         deviceMAOrderDao.insert(deviceMAOrderEntity);
         deviceMaOrderDetailDao.insert(detailEntity);
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
index 5f895750..eeabf9f1 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
@@ -381,6 +381,8 @@
             <if test="deptCode != null and deptCode != ''">
                 AND dco.deptCode = #{deptCode}
             </if>
+            <if test="status != null"></if>
+            AND dco.status = #{status}
         </where>
         group by dcod.code
     </select>