1.修复设备养护备注字段未保存的问题

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

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);

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>