From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +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/RegionInspectionRecordServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
index 6d12941..7484f6e 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
@@ -44,17 +44,18 @@
public BasicResult insertAndUpdate(RegionInspectionRecordEntity regionInspectionEntity) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String userId = sysUserInfo.getUserId();
+ String platUserId = regionInspectionRecordMapper.selectPlatUserId(userId);
//修改逻辑
if (StringUtils.isNotBlank(regionInspectionEntity.getId())){
regionInspectionEntity.setUpdateUser(userId);
regionInspectionEntity.setInspectionTime(new Date());
regionInspectionEntity.setUpdateTime(new Date());
}
+ regionInspectionRecordMapper.deleteIMG(regionInspectionEntity.getId());
synchronized (this){
//修改打卡记录
regionInspectionEntity.setCreateUser(userId);
regionInspectionRecordMapper.insert(regionInspectionEntity);
-
//添加记录相对应的图片
if (!regionInspectionEntity.getImgList().isEmpty()){
regionInspectionEntity.getImgList().forEach(obj->{
@@ -185,6 +186,7 @@
.recordEntity(recordEntity)
.imgList(imgEntityList)
.result(recordEntity.getResult())
+ .status(recordEntity.getStatus())
.build();
regionList.add(regionEntity);
}
--
Gitblit v1.9.3