From f7beae39603d6a1ea76da6b0b757906b2a2932cc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 28 Jun 2024 12:00:09 +0800
Subject: [PATCH] 湖北水库：施工：项目进度列表修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index 73d8cb5..8b1acca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -44,7 +44,8 @@
re.STATUS as reportStatus,
d.STATUS as deviceStatus,
pro.STATUS as projectStatus,
- re.id as reportId
+ re.id as reportId,
+ pro.lon_lat
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -62,12 +63,19 @@
<if test="dto.status != null">
and pro.status = #{dto.status}
</if>
+ <if test="dto.projectIds != null and dto.projectIds.size > 0">
+ and pro.id in
+ <foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
</select>
<select id="progressList" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
SELECT
pro.id,
pro.project_name,
- pro.lon_lat
+ pro.lon_lat,
+ pro.status
FROM
ywxt.sg_project_info pro where 1=1
<if test="dto.status != null">
--
Gitblit v1.9.3