From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
index 03275cb..8040942 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}
@@ -166,6 +169,7 @@
a.regionInspectionId,
a.inspectionTime,
a.task,
+ a.standard,
a.region,
a.realName,
IF(a.completeRegionNum = a.needRegionNum,"已完成","待巡检") statusName,
@@ -176,6 +180,7 @@
t.regionInspectionId,
MIN(t.inspectionTime) inspectionTime,
tri.task task,
+ tri.standard standard,
GROUP_CONCAT(DISTINCT trhi.region) region,
spu.real_name realName,
SUM(t.`status`)/(SELECT count(regionInspectionId) FROM t_region_inspection_hazard_inform WHERE regionInspectionId = t.regionInspectionId) completeRegionNum,
@@ -196,9 +201,13 @@
<if test="regionInspectionId !=null and regionInspectionId !=''">
and t.regionInspectionId = #{regionInspectionId}
</if>
+ <if test="userId !=null and userId !=''">
+ and t.userId = #{userId}
+ </if>
<if test="startTime != null and endTime != null and startTime !='' and endTime != ''">
and t.inspectionTime BETWEEN str_to_date(#{startTime}, "%Y-%m-%d %H:%i:%s") and str_to_date(#{endTime}, "%Y-%m-%d %H:%i:%s")
</if>
+
GROUP BY t.regionInspectionId,t.userId
)a
WHERE 1=1
@@ -282,7 +291,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
@@ -292,27 +302,42 @@
</select>
<select id="selectAppList" resultType="java.util.Map">
+ select * from (
SELECT
- a.id,
- MIN( b.inspectionTime ) inspectionTime,
- a.`status`,
- a.task,
- GROUP_CONCAT(DISTINCT d.region) region
- FROM
- t_region_inspection a
- LEFT JOIN t_region_inspection_record b ON b.regionInspectionId = a.id
- LEFT JOIN t_region_inspection_hazard_inform c ON c.regionInspectionId = a.id
- LEFT JOIN t_region_hazard_inform d ON c.regionHazardInformId = d.id
- LEFT JOIN t_region_inspection_user e on e.regionInspectionId = a.id
- WHERE a.companyId = #{companyId} and e.userId = #{userId}
- <if test="status != null and status != ''">
- and a.status = #{status}
+ tri.id,
+ t.userId ,
+ t.regionInspectionId,
+ MIN(t.inspectionTime) inspectionTime,
+ tri.task task,
+ GROUP_CONCAT(DISTINCT trhi.region) region,
+ spu.real_name realName,
+ if(
+ SUM(t.`status`)/(SELECT count(regionInspectionId) FROM t_region_inspection_hazard_inform WHERE
+ regionInspectionId = t.regionInspectionId)
+ =
+ (SELECT count(regionInspectionId) FROM t_region_inspection_hazard_inform WHERE regionInspectionId =
+ t.regionInspectionId)
+ ,1,0) status
+ from
+ t_region_inspection_record t
+ LEFT JOIN t_region_inspection tri on tri.id = t.regionInspectionId
+ LEFT JOIN t_region_inspection_hazard_inform trihi on trihi.regionInspectionId = t.regionInspectionId
+ LEFT JOIN t_region_hazard_inform trhi on trhi.id = trihi.regionHazardInformId
+ LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
+ WHERE 1=1
+ <if test="userId != null and userId != ''">
+ and t.userId = #{userId}
</if>
<if test="startTime != null and endTime != null and startTime !='' and endTime != ''">
- and t.inspectionTime BETWEEN str_to_date(#{startTime}, "%Y-%m-%d %H:%i:%s") and str_to_date(#{endTime}, "%Y-%m-%d %H:%i:%s")
+ and t.inspectionTime BETWEEN str_to_date(#{startTime}, "%Y-%m-%d %H:%i:%s") and str_to_date(#{endTime},
+ "%Y-%m-%d %H:%i:%s")
</if>
- GROUP BY
- a.id
+ GROUP BY t.regionInspectionId,t.userId
+ ) entity where 1=1
+ <if test="status != null and status != ''">
+ and entity.status = #{status}
+ </if>
+
</select>
<select id="selectPlatUserId" resultType="java.lang.String">
--
Gitblit v1.9.3