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>