From 7f32b16b1cf4623596183d279574a01df9cda56c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 31 Jul 2024 19:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=A3=80=E7=9A=84=E7=8A=B6=E6=80=81bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XzSecurityInspectTaskRecordServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java index baaeac3d1..d75f282d6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java @@ -189,8 +189,15 @@ public class XzSecurityInspectTaskRecordServiceImpl extends ServiceImpl overDueItemIdSet = itemRecords.stream().filter(x -> - //2024-08-05/2024-08-06/第1次 - DateUtil.compare(DateUtil.parse(x.getItemName().split("/")[1]), DateUtil.parse(DateUtil.format(new Date(), "yyyy-MM-dd"))) < 0 + { + if(Objects.equals(data.getFrequencyType(),XzSecurityInspectTaskRecordFrequencyTypeEnum.DAY.getValue())){ + //2024-08-08/第1次 + return DateUtil.compare(DateUtil.parse(x.getItemName().split("/")[0]), DateUtil.parse(DateUtil.format(new Date(), "yyyy-MM-dd"))) < 0; + }else{ + //2024-08-05/2024-08-06/第1次 + return DateUtil.compare(DateUtil.parse(x.getItemName().split("/")[1]), DateUtil.parse(DateUtil.format(new Date(), "yyyy-MM-dd"))) < 0; + } + } ).map(XzSecurityInspectTaskItemRecord::getId).collect(Collectors.toSet()); Set irSet = inspectionRecords.stream().filter(x -> overDueItemIdSet.contains(x.getItemId())).map(XzSecurityQualityInspectionRecord::getItemId).collect(Collectors.toSet()); if (overDueItemIdSet.size() != irSet.size()) {