From d493ada61fb4d5106e0ed484d4d1ed395450dab0 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 24 Aug 2021 14:39:33 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/impl/ResourceInspectPlanServiceImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
index 8aff0f5a..6a200eb6 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
@@ -106,6 +106,12 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
             returnStatus = true;
             resourceInspectPlan.setStatus("401");
         }else{
+            ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
+            resourceInspectTask.setResourceInspectPlanBo(planHandle.getHandle());
+            List<ResourceInspectTask> resourceInspectTasks = resourceInspectTaskService.selectList(resourceInspectTask);
+            if (!planHandle.getScheduleType().equals(resourceInspectPlan.getScheduleType()) && resourceInspectTasks.size() > 0){
+                throw BusinessException.build("已创建任务的点检计划，不能修改排程方式！");
+            }
             // 保留创建人员和创建时间
             String createUser = planHandle.getCreateUser();
             LocalDateTime createdDateTime = planHandle.getCreatedDateTime();

From aa0b7e626294626dd20d31477bee2b1da344dc48 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 24 Aug 2021 15:39:03 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ResourceInspectTaskMapper.xml    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index c64867a7..7e0585e8 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -712,9 +712,16 @@
     <select id="getInspectTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
         SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
         WHERE ZRIT.SITE = #{site}
-          AND ZRIT.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
+        <if test="resourceInspectPlanBo != null and resourceInspectPlanBo != ''">
+            AND ZRIT.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
+        </if>
+        <if test="resrce != null and resrce != ''">
+            AND ZRIT.resrce = #{resrce}
+        </if>
+        AND ZRIT.STATUS IN ('DOING','NEW')
+          /*AND ZRIT.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
           AND ZRIT.RESRCE = #{resrce}
-          AND ZRIT.STATUS IN ('DOING','NEW')
+          AND ZRIT.STATUS IN ('DOING','NEW')*/
     </select>
     <!--自定义sql-->
 

From f693724ef938b7c7ee58a81e333549002052608e Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 24 Aug 2021 15:56:33 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResourceInspectPlanServiceImpl.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
index 6a200eb6..6114482e 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
@@ -306,6 +306,9 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
                         ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                         resourceInspectTaskList.add(equipInspectTask);
                         taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
+                        if (taskCreateDate.isAfter(indateEnd)){
+                            break;
+                        }
                         taskNum--;
                     }
                 }else{
@@ -319,12 +322,18 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
                             ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                             resourceInspectTaskList.add(equipInspectTask);
                             taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
+                            if (taskCreateDate.isAfter(indateEnd)){
+                                break;
+                            }
                         }
                     }else {
                         while (taskCreateDate.isBefore(createdDateTime)){
                             taskCreateDate = addTime(frequencyUnit,frequency,taskCreateDate);
                         }
                         for (int i = 0;i < taskNum;i++){
+                            if (taskCreateDate.isAfter(indateEnd)){
+                                break;
+                            }
                             resourceInspectTask.setTaskCreateDate(taskCreateDate);
                             ResourceInspectTask equipInspectTask = setResourceInspectTask(resourceInspectPlan, resourceInspectTask,sign);
                             resourceInspectTaskList.add(equipInspectTask);

From c6d7d8d4344fa9e3fb187fda97060ce684f59155 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 24 Aug 2021 15:56:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResourceInspectTaskMapper.xml  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index 7e0585e8..30a34cd2 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -712,16 +712,13 @@
     <select id="getInspectTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
         SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
         WHERE ZRIT.SITE = #{site}
+        AND ZRIT.STATUS IN ('DOING','NEW')
         <if test="resourceInspectPlanBo != null and resourceInspectPlanBo != ''">
             AND ZRIT.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
         </if>
         <if test="resrce != null and resrce != ''">
             AND ZRIT.resrce = #{resrce}
         </if>
-        AND ZRIT.STATUS IN ('DOING','NEW')
-          /*AND ZRIT.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
-          AND ZRIT.RESRCE = #{resrce}
-          AND ZRIT.STATUS IN ('DOING','NEW')*/
     </select>
     <!--自定义sql-->
 

From 1aa594a15d523661a07ab532c6ab9c3a0385aa38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 24 Aug 2021 17:11:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?gitee=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/controller/AbnormalBillController.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index ca439de2..aa5a6acf 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -352,7 +352,6 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.anomalyReveseRepair(abnormalBill,abnormalBillDispose));
     }
 
-
     @GetMapping("/findNcCodeDescriptionByNcCode")
     public R findNcCodeDescriptionByNcCode(String ncCode){
         return R.ok(ncCodeService.findNcCodeDescriptionByNcCode(ncCode));