PDA任务列表展示顺序只展示范围内

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

@@ -99,7 +99,40 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     @DS("#header.poolName")
     public AjaxResult getTodayTask(PDADTO pdadto) {
         List<EquOrder> orderList = equOrderMapper.selectTodayTask(pdadto);
-        return success(orderList);
+        List<EquOrder> handleList = new ArrayList<>();
+        long nowTime = DateUtils.getNowDate().getTime();
+        long dayMs = 86400000l;
+        if (orderList!=null) {
+            for (EquOrder order : orderList) {
+                long diff = nowTime - order.getCreateTime().getTime();
+                if (order.getPlanLoopType().equals("day")){
+                    if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) {
+                        handleList.add(order);
+                    }
+                }
+                if (order.getPlanLoopType().equals("week")){
+                    if (diff < (dayMs*7 * Long.valueOf(order.getPlanLoop()))) {
+                        handleList.add(order);
+                    }
+                }
+                if (order.getPlanLoopType().equals("month")){
+                    if (diff < (dayMs*30 * Long.valueOf(order.getPlanLoop()))) {
+                        handleList.add(order);
+                    }
+                }
+                if (order.getPlanLoopType().equals("season")){
+                    if (diff < (dayMs*30*3 * Long.valueOf(order.getPlanLoop()))) {
+                        handleList.add(order);
+                    }
+                }
+                if (order.getPlanLoopType().equals("year")){
+                    if (diff < (dayMs*365 * Long.valueOf(order.getPlanLoop()))) {
+                        handleList.add(order);
+                    }
+                }
+            }
+        }
+        return success(handleList);
     }
 
     /**

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

@@ -180,7 +180,6 @@
 		where eo.plan_type = #{planType}
 		  and eo.del_flag = '0'
 		  and eo.order_status != '1'
-		  and CONVERT(date,eo.create_time) = CONVERT(date,GETDATE())
 		  and eo.order_code in (select order_code
 								from equ_order_person
 								where del_flag = '0'