From 92b2c64d622d76466730d2543d2b0a8357332e86 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 17:31:38 +0800
Subject: [PATCH] 湖北水库：施工：项目列表添加片区、审批详情添加机构名
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 6754b45..7f97168 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -140,7 +140,7 @@
LEFT JOIN ywxt.sg_device de ON gx.gx_type = de.device_type
LEFT JOIN ywxt.sg_progress_report re ON re.gx_step_id = step.id and re.gx_device_id = de.id
WHERE
- 1 =1 and de.id = #{deviceId}
+ 1 =1 and re."STATUS" != 4 and de.id = #{deviceId}
</select>
<select id="statusCount" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
SELECT
@@ -164,9 +164,9 @@
</if>
</select>
<select id="getUserByIds" resultType="java.util.Map">
- select id ,real_name from ywxt.blade_user where 1 = 1
+ select u.id ,u.real_name ,d.full_name as deptName from ywxt.blade_user u inner join ywxt.blade_dept d on u.dept_id = d.id where 1 = 1
<if test="ids != null and ids.size>0">
- AND id in
+ AND u.id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.9.3