From 89dbaeded0a13526232d855eac0425708876eb6d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期五, 04 八月 2023 16:12:14 +0800
Subject: [PATCH] 调正时间格式
---
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
index c8548a1..d37efdd 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
@@ -421,7 +421,11 @@
if (CollectionUtils.isNotEmpty(elementTreeList)) {
for (ElementTree elementA : elementTreeList) {
- List<SafetySelfInspectionItem> selectElementList = itemList.stream().filter(item -> item.getElementA().equals(elementA.getValue())).collect(Collectors.toList());
+ List<SafetySelfInspectionItem> selectElementList = itemList
+ .stream()
+ .filter(item -> item.getElementA() != null &&
+ item.getElementA().equals(elementA.getValue()))
+ .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(selectElementList)) {
SafetySelfInspectionElementRespDTO elementARespDTO = new SafetySelfInspectionElementRespDTO();
elementARespDTO.setElementId(elementA.getValue());
@@ -449,7 +453,9 @@
//无三级要素过滤出二级要素检查内容
List<SafetySelfInspectionItem> sItemList = itemList
.stream()
- .filter(item -> item.getElementC() == null && item.getElementB().equals(stree.getValue()))
+ .filter(item -> item.getElementC() == null
+ && item.getElementB() != null
+ && item.getElementB().equals(stree.getValue()))
.collect(Collectors.toList());
//填充检查项
elementBRespDTO.setItemList(assemblyDeduction(sItemList));
@@ -624,7 +630,7 @@
//否决 合格--删除扣分记录
safetySelfInspectionItemDeductionMapper.delBySafetySelfInspectionItemId(param.getId(),username,date);
//删除隐患
- dangerService.delByInspectionItemId(param.getSafetyInspectionItemId(),user);
+ dangerService.delByInspectionItemId(param.getId(),user);
//删除附件
attachmentInfoService.deleteByBusinessId(param.getId());
}else{
@@ -724,6 +730,7 @@
safetySelfInspection.setStatus(2);
safetySelfInspection.setUpdateTime(date);
safetySelfInspection.setUpdateBy(username);
+ safetySelfInspection.setInspectionEndTime(new Date());
safetySelfInspectionMapper.updateById(safetySelfInspection);
}
--
Gitblit v1.9.2