2024-2-28 设备看板 维修工单判空处理+显示限制条件

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

@@ -5,18 +5,14 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
 import com.op.device.mapper.*;
-import com.op.device.domain.EquOperationRecord;
 import com.op.device.domain.EquRepairWorkOrder;
-import com.op.device.domain.MesReportWork;
 import com.op.device.domain.vo.IEquFaultVO;
-import com.op.device.mapper.EquEquipmentMapper;
 import com.op.device.domain.vo.IEquipmentVO;
 import com.op.device.domain.vo.IRepairWorkOrderVO;
 import com.op.device.service.IDeviceInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,9 +41,9 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
                 if(orderVO.getWorkHandle() != null){
                     if (orderVO.getWorkHandle().equals("0")) {
                         orderVO.setWorkHandle("立即");
-                    } else {
-                        orderVO.setWorkHandle("计划");
                     }
+                }else {
+                    orderVO.setWorkHandle("计划");
                 }
             }
         }

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -13,11 +13,10 @@
                wo.work_plan_time     AS "workPlanTime",
                be.equipment_location AS "equipmentLocation"
         from equ_repair_work_order wo
-                 left join base_equipment be
-                           on wo.equipment_code = be.equipment_code
-                 left join equ_team et
-                           on wo.work_team = et.team_code
+        left join base_equipment be on wo.equipment_code = be.equipment_code
+        left join equ_team et on wo.work_team = et.team_code
         where wo.work_status = '0'
+		and wo.del_flag = '0'
     </select>
 
     <select id="selectEquipmentList" parameterType="EquOperation" resultType="com.op.device.domain.vo.IEquipmentVO">