From 7806f1910522ac9ab1eaebd26ab973afec54850c Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 30 十一月 2023 09:30:38 +0800
Subject: [PATCH] 20231130_qiuyh_调整区域巡检打卡
---
hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml | 6 +++++-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java | 3 ++-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java | 3 ++-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java | 2 +-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java | 1 +
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java
index 0d2545e..ad88884 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java
@@ -44,5 +44,6 @@
RegionInspectionRecordEntity recordEntity;
private String result;//巡检结果
- List<RegionInspectionRecordImgEntity> imgList;
+ private List<RegionInspectionRecordImgEntity> imgList;
+ private Integer status;//该区域的巡检状态
}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java
index aa3a6b5..5ef8cea 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java
@@ -51,5 +51,5 @@
private String imgPaths;
- List<RegionInspectionRecordImgEntity> imgList;
+ private List<RegionInspectionRecordImgEntity> imgList;
}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
index 6a9766c..824202b 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
@@ -41,6 +41,7 @@
@Param("regionHazardInformId")String regionHazardInformId);
void insertIMG(RegionInspectionRecordImgEntity regionInspectionRecordImgEntity);
+ void deleteIMG(String regionInspectionRecordId);
List<RegionInspectionRecordImgEntity> selectImgByRecordId(String regionInspectionRecordId);
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..efaa3fc 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
@@ -50,11 +50,11 @@
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 +185,7 @@
.recordEntity(recordEntity)
.imgList(imgEntityList)
.result(recordEntity.getResult())
+ .status(recordEntity.getStatus())
.build();
regionList.add(regionEntity);
}
diff --git a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
index 03275cb..47cc911 100644
--- a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
@@ -153,6 +153,9 @@
<delete id="delete">
delete from t_region_inspection_record where id=#{id,jdbcType=VARCHAR}
</delete>
+ <delete id="deleteIMG">
+ delete from t_region_inspection_record_img where regionInspectionRecordId=#{regionInspectionRecordId,jdbcType=VARCHAR}
+ </delete>
<delete id="deleteByRegionInspectionId">
delete from t_region_inspection_record where regionInspectionId=#{regionInspectionId,jdbcType=VARCHAR}
@@ -282,7 +285,8 @@
t.result result,
GROUP_CONCAT(timg.imgPath) imgPaths,
t.location,
- spu.real_name realName
+ spu.real_name realName,
+ t.status
FROM t_region_inspection_record t
LEFT JOIN t_region_inspection_record_img timg on t.id = timg.regionInspectionRecordId
LEFT JOIN t_region_hazard_inform rhi on rhi.id = t.regionHazardInformId
--
Gitblit v1.9.3