From e5cd5597aad68f294fcfff465e0a312713804c0d Mon Sep 17 00:00:00 2001
From: shishuaikang <280848880@qq.com>
Date: 星期二, 12 十二月 2023 13:40:25 +0800
Subject: [PATCH] h5大屏伴和站样式修改

---
 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 d32f128..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->{
@@ -160,23 +161,33 @@
 	public BasicResult selectAppInfo(String regionInspectionId, String userId) {
 		SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
 		userId = sysUserInfo.getUserId();
-		RegionInspectionEntity obj = regionInspectionRecordMapper.selectInfo(regionInspectionId, userId);
+		String platUserId = regionInspectionRecordMapper.selectPlatUserId(userId);
+		RegionInspectionEntity obj = regionInspectionRecordMapper.selectInfo(regionInspectionId, platUserId);
 		List<RegionInspectionHazardInformEntity> regionList = new ArrayList<>();
-		if (obj.getRegionIds()!=null){
+		if (obj!=null && obj.getRegionIds()!=null){
 			String[] regionIds = obj.getRegionIds().intern().split(",");
 			String[] regions = obj.getRegions().intern().split(",");
 			//区域对象数组
 			for (int i = 0; i < regionIds.length; i++) {
 				RegionInspectionRecordEntity recordEntity = regionInspectionRecordMapper.regionInfo(
 						regionInspectionId,
-						userId,
+						platUserId,
 						regionIds[i]);
+				List<RegionInspectionRecordImgEntity> imgEntityList=null;
+				if (recordEntity!=null){
+					imgEntityList = regionInspectionRecordMapper.selectImgByRecordId(recordEntity.getId());
+					recordEntity.setImgList(imgEntityList);
+				}
 				RegionInspectionHazardInformEntity regionEntity = RegionInspectionHazardInformEntity
 						.builder()
 						.regionInspectionId(obj.getId())
 						.regionHazardInformId(regionIds[i])
 						.region(regions[i])
-						.recordEntity(recordEntity).build();
+						.recordEntity(recordEntity)
+						.imgList(imgEntityList)
+						.result(recordEntity.getResult())
+						.status(recordEntity.getStatus())
+						.build();
 				regionList.add(regionEntity);
 			}
 		}

--
Gitblit v1.9.3