From b69ca5e06f8f5c56f8b1270370a81bcecf57bfe7 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 30 十一月 2023 14:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
index 9cd46f2..78c8956 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
@@ -79,10 +79,11 @@
regionInspectionMapper.insertInspectionHazardInform(region);
}
- //添加任务的时候添加打卡记录 新增的是待打卡状态
- if (StringUtils.isBlank(regionInspectionEntity.getId())){
- for (String addUserId : userIds) {
- for (String regionId : regionIds) {
+ //添加或修改任务的时候添加打卡记录 是待打卡状态
+ for (String addUserId : userIds) {
+ for (String regionId : regionIds) {
+ RegionInspectionRecordEntity checkIsNull = regionInspectionRecordMapper.regionInfo(regionInspectionEntity.getId(), addUserId, regionId);
+ if (checkIsNull==null){
RegionInspectionRecordEntity regionInspectionRecordEntity =
RegionInspectionRecordEntity
.builder()
@@ -97,6 +98,7 @@
}
}
+
//添加/修改区域巡检
regionInspectionEntity.setId(regionInspectId);
regionInspectionEntity.setCreateUser(userId);
--
Gitblit v1.9.3