From 76bdb1fbb38cd37fba1c4b0d409d394eb28a788c Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 16 Nov 2023 11:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/device/domain/EquPlan.java    | 30 +++++++++++++++++++
 .../service/impl/EquPlanServiceImpl.java      |  4 +++
 .../resources/mapper/device/EquPlanMapper.xml |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
index 39b371ca..9dcc738c 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
@@ -151,6 +151,36 @@ public class EquPlan extends BaseEntity {
 
 	private Date loopEnd;
 
+	private List<Date> loopEndArray;
+
+	private Date loopEndArrayStart;
+
+	private Date getLoopEndArrayEnd;
+
+	public List<Date> getLoopEndArray() {
+		return loopEndArray;
+	}
+
+	public void setLoopEndArray(List<Date> loopEndArray) {
+		this.loopEndArray = loopEndArray;
+	}
+
+	public Date getLoopEndArrayStart() {
+		return loopEndArrayStart;
+	}
+
+	public void setLoopEndArrayStart(Date loopEndArrayStart) {
+		this.loopEndArrayStart = loopEndArrayStart;
+	}
+
+	public Date getGetLoopEndArrayEnd() {
+		return getLoopEndArrayEnd;
+	}
+
+	public void setGetLoopEndArrayEnd(Date getLoopEndArrayEnd) {
+		this.getLoopEndArrayEnd = getLoopEndArrayEnd;
+	}
+
 	public Date getLoopEnd() {
 		return loopEnd;
 	}
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index cc16bf04..d72e0b73 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -99,6 +99,10 @@ public class EquPlanServiceImpl implements IEquPlanService {
             equPlan.setLoopStart(equPlan.getLoopStartArray().get(0));
             equPlan.setLoopEnd(equPlan.getLoopStartArray().get(1));
         }
+        if (equPlan.getLoopEndArray() != null) {
+            equPlan.setLoopEndArrayStart(equPlan.getLoopEndArray().get(0));
+            equPlan.setGetLoopEndArrayEnd(equPlan.getLoopEndArray().get(1));
+        }
         List<EquPlan> equPlans = equPlanMapper.selectEquPlanList(equPlan);
 
         //获取当前所选工厂
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
index 1d50851f..a0eb4be8 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
@@ -75,6 +75,8 @@
 			<if test="shutDown != null  and shutDown != ''"> and shut_down = #{shutDown}</if>
 			<if test="loopStart != null "> and CONVERT(date,plan_loop_start) >= #{loopStart}</if>
 			<if test="loopEnd != null "> and #{loopEnd} >= CONVERT(date,plan_loop_start)</if>
+			<if test="loopEndArrayStart != null "> and CONVERT(date,plan_loop_end) >= #{loopEndArrayStart}</if>
+			<if test="getLoopEndArrayEnd != null "> and #{getLoopEndArrayEnd} >= CONVERT(date,plan_loop_end)</if>
 			 and del_flag = '0'
 		</where>
 	</select>