2024-2-28 设备模块-看板-维修工单判空处理+管理系统汇总报表排序

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java

@@ -40,13 +40,17 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
     @DS("#header.poolName")
     public AjaxResult getRepairWorkOrder() {
         List<IRepairWorkOrderVO> workOrderVOList = deviceInterfaceMapper.selectEquRepairWorkOrderList();
+        if(workOrderVOList != null){
             for (IRepairWorkOrderVO orderVO : workOrderVOList) {
+                if(orderVO.getWorkHandle() != null){
                     if (orderVO.getWorkHandle().equals("0")) {
                         orderVO.setWorkHandle("立即");
                     } else {
                         orderVO.setWorkHandle("计划");
                     }
                 }
+            }
+        }
         return success(workOrderVOList);
     }
 

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
 	</select>
 
     <select id="selectWorkCenter" resultType="com.op.device.domain.WorkCenter">