From 26d7ca3bd9c6f01ca1a55e35b993b94abc7ddbec Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Mon, 6 Sep 2021 17:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=82=B9=E6=A3=80=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93=E6=97=A5=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/mapper/ResourceInspectTaskMapper.java |  2 ++
 .../impl/ResourceRepairTaskServiceImpl.java     |  2 +-
 .../mapper/ResourceInspectTaskMapper.xml        | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java
index cfa0459d..f992d60b 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java
@@ -34,6 +34,8 @@ public interface ResourceInspectTaskMapper extends BaseMapper<ResourceInspectTas
      */
     List<ResourceInspectTask> getInspectTaskList(ResourceInspectTask resourceInspectTask);
 
+    List<ResourceInspectTask> getInspectTaskListByCondition(ResourceInspectTask resourceInspectTask);
+
     /**
      * 查找最新的任务创建时间
      * @param resourceInspectTask
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index 8d096b0f..07a59942 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -257,7 +257,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 resourceInspectTask.setPlanStartDate(startDate);
                 resourceInspectTask.setPlanCompleteDate(endDate);
                 resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
-                List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask);
+                List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
                 for (ResourceInspectTask inspectTask:inspectTaskList) {
                     if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
                         resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask);
diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index d5debda4..5c65907f 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -729,6 +729,23 @@
             AND ZRIT.TASK_CREATE_DATE &gt;= #{planStartDate}
         </if>
     </select>
+    <!--条件查询，查询点检任务-->
+    <select id="getInspectTaskListByCondition" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
+        SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
+        WHERE ZRIT.SITE = #{site}
+        <if test="resrce != null and resrce != ''">
+            AND ZRIT.RESRCE = #{resrce}
+        </if>
+        <if test="category != null and category != ''">
+            AND ZRIT.CATEGORY = #{category}
+        </if>
+        <if test="planCompleteDate != null">
+            AND ZRIT.TASK_CREATE_DATE &lt;= #{planCompleteDate}
+        </if>
+        <if test="planStartDate != null">
+            AND ZRIT.TASK_CREATE_DATE &gt;= #{planStartDate}
+        </if>
+    </select>
 
     <select id="findResourceTaskByResrceAndCategory" resultType="Integer">
         SELECT  COUNT(*)  FROM Z_RESOURCE_INSPECT_TASK ZRIT