From e1cdb7930d2eb4baccff2809a420a1f0f544c934 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 18:58:41 +0800
Subject: [PATCH] 湖北水库:施工:项目整体进度

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 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 0a3379c..86cccf0 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
@@ -3,7 +3,9 @@
 <mapper namespace="cn.gistack.sm.sg.mapper.SgProgressReportMapper">
 
     <select id="queryPageList" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
-        select * from  SG_PROGRESS_REPORT report where 1=1
+        select report.* ,re.device_name,re.device_type from  SG_PROGRESS_REPORT report
+        left join  ywxt.sg_device de on report.gx_device_id = de.id
+        where 1=1
         <if test="dto.projectName != null and dto.projectName != ''">
             and report.PROGRAM_NAME = #{dto.projectName}
         </if>

--
Gitblit v1.9.3