admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

自检的状态bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-31 19:36:05 +08:00
parent d24f9e8990
commit 7f32b16b1c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java
View File

@ -189,8 +189,15 @@ public class XzSecurityInspectTaskRecordServiceImpl extends ServiceImpl<XzSecuri
} }
} else { } else {
Set<Long> overDueItemIdSet = itemRecords.stream().filter(x -> Set<Long> overDueItemIdSet = itemRecords.stream().filter(x ->
{
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次 //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 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()); ).map(XzSecurityInspectTaskItemRecord::getId).collect(Collectors.toSet());
Set<Long> irSet = inspectionRecords.stream().filter(x -> overDueItemIdSet.contains(x.getItemId())).map(XzSecurityQualityInspectionRecord::getItemId).collect(Collectors.toSet()); Set<Long> irSet = inspectionRecords.stream().filter(x -> overDueItemIdSet.contains(x.getItemId())).map(XzSecurityQualityInspectionRecord::getItemId).collect(Collectors.toSet());
if (overDueItemIdSet.size() != irSet.size()) { if (overDueItemIdSet.size() != irSet.size()) {