From 16bbc893964a2da5e4de91acef6a49ca78dd152e Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 6 Sep 2021 17:00:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=82=B9=E6=A3=80=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93=E6=97=A5?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ReportDataMapper.xml | 4 +-- .../ResourceInspectTaskJobServiceImpl.java | 11 ++++---- .../impl/ResourceRepairTaskServiceImpl.java | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 79ba6c39..f6004a3c 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -135,9 +135,9 @@ LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO WHERE ZSD.SITE = #{site} - + AND CFA.VALUE LIKE '%'||#{workOrder}||'%' diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskJobServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskJobServiceImpl.java index 550324fe..a55e6ad3 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskJobServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskJobServiceImpl.java @@ -7,11 +7,11 @@ import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskJobService; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService; import com.foreverwin.modular.core.util.CommonMethods; -import org.apache.tomcat.jni.Local; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -32,10 +32,11 @@ public class ResourceInspectTaskJobServiceImpl implements ResourceInspectTaskJob ResourceInspectTask resourceInspectTask = new ResourceInspectTask(); resourceInspectTask.setSite(site); resourceInspectTask.setCategory(Constants.INSPECTION_TYPE_DM); - LocalDateTime now = LocalDateTime.now(); - LocalDateTime dateTime = LocalDateTime.now().minusDays(1); - resourceInspectTask.setPlanStartDate(dateTime); - resourceInspectTask.setPlanCompleteDate(now); + LocalDate now = LocalDate.now(); + LocalDateTime startDate = LocalDateTime.parse(now.minusDays(1) + "T00:00:00"); + LocalDateTime endDate = LocalDateTime.parse(now + "T00:00:00"); + resourceInspectTask.setPlanStartDate(startDate); + resourceInspectTask.setPlanCompleteDate(endDate); List inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask); for (ResourceInspectTask inspectTask: inspectTaskList) { resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask); 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 b07df861..8d096b0f 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 @@ -7,9 +7,12 @@ import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.service.AnomalyService; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper; import com.foreverwin.mesnac.equip.mapper.ResourceRepairTaskMapper; +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; import com.foreverwin.mesnac.equip.model.ResourceRepairTask; +import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService; import com.foreverwin.mesnac.meapi.dto.NcCodeDto; @@ -28,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.Duration; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Arrays; import java.util.HashMap; @@ -66,6 +70,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl init() { @@ -238,6 +246,24 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask); + for (ResourceInspectTask inspectTask:inspectTaskList) { + if (Constants.RSESULT_NG.equals(inspectTask.getResult())){ + resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask); + break; + } + } break; case "302": // 取消代码、取消描述、取消时间、取消人员 From ccab1917bbe40936d77ad6e9468f37b7e257b6ad Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 6 Sep 2021 17:07:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=8A=A0=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index d21320b5..b39bb785 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -1410,7 +1410,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl Date: Mon, 6 Sep 2021 17:58:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=82=B9=E6=A3=80=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=BD=93=E6=97=A5?= =?UTF-8?q?=E7=82=B9=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 getInspectTaskList(ResourceInspectTask resourceInspectTask); + List 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 inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask); + List 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 >= #{planStartDate} + +