From 09b59c4d30416006b50999cbfe6ac1dd64912319 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 28 Feb 2024 13:24:12 +0800 Subject: [PATCH] =?UTF-8?q?2024-2-28=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E7=9C=8B=E6=9D=BF-=E7=BB=B4=E4=BF=AE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86+=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceInterfaceServiceImpl.java | 14 +++++++++----- .../resources/mapper/device/EquCheckItemMapper.xml | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index f4078898..7a323b58 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -40,11 +40,15 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @DS("#header.poolName") public AjaxResult getRepairWorkOrder() { List workOrderVOList = deviceInterfaceMapper.selectEquRepairWorkOrderList(); - for (IRepairWorkOrderVO orderVO : workOrderVOList) { - if (orderVO.getWorkHandle().equals("0")) { - orderVO.setWorkHandle("立即"); - } else { - orderVO.setWorkHandle("计划"); + if(workOrderVOList != null){ + for (IRepairWorkOrderVO orderVO : workOrderVOList) { + if(orderVO.getWorkHandle() != null){ + if (orderVO.getWorkHandle().equals("0")) { + orderVO.setWorkHandle("立即"); + } else { + orderVO.setWorkHandle("计划"); + } + } } } return success(workOrderVOList); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index 6166a07a..f6bed226 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -192,6 +192,7 @@ FROM equ_check_item eci left join equ_check_item_detail ecid on eci.item_code = ecid.parent_code where eci.del_flag = '0' + order by eci.item_type_name desc