点检、巡检查询优化

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;
 	}

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);
 
         //获取当前所选工厂

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>