From 1f66bd46884ad668bff387e71f05c179cf4409d2 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 8 Jan 2024 20:32:00 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=E5=8F=AA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DevicePDAServiceImpl.java    | 35 ++++++++++++++++++-
 .../mapper/device/EquOrderMapper.xml          |  1 -
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index 9777cee0d..336385f6b 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/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);
     }
 
     /**
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index d34d9e895..af0d332bf 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/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'