From cc873cace93a40068d6bb6130b601b6c3e845b42 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 20:40:48 +0800
Subject: [PATCH] 湖北水库：施工：APP待办列表、数量统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 03e4089..4eb77e3 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
@@ -13,21 +13,24 @@
</select>
<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
SELECT
- pro.id,
- pro.project_name,
- gx.id as gxId,
- gx.gx_name,
- d.device_name,
- d.id as dId,
- step.gx_step_name,
- step.gx_step_num,
- re.STATUS
+ pro.id,
+ pro.project_name,
+ gx.id as gxId,
+ gx.gx_name,
+ d.device_name,
+ d.device_type,
+ dict."DICT_VALUE" as typeName,
+ d.id as dId,
+ step.gx_step_name,
+ step.gx_step_num,
+ re.STATUS
FROM
- ywxt.sg_project_info pro
- LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
- LEFT JOIN ywxt.sg_gx gx ON d.device_type = gx.gx_type
- LEFT JOIN ywxt.sg_gx_step step ON gx.id = step.gx_info_id
- LEFT JOIN ywxt.sg_progress_report re ON re.gx_step_id = step.id
+ ywxt.sg_project_info pro
+ LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
+ left join YWXT."BLADE_DICT_BIZ" as dict on d.device_type=dict.DICT_KEY and dict.CODE='SG_DEVICE_TYPE'
+ LEFT JOIN ywxt.sg_gx gx ON d.device_type = gx.gx_type
+ LEFT JOIN ywxt.sg_gx_step step ON gx.id = step.gx_info_id
+ LEFT JOIN ywxt.sg_progress_report re ON re.gx_step_id = step.id and re.gx_device_id = d.id
where 1=1
<if test="dto.projectId != null and dto.projectId != ''">
and pro.id = #{dto.projectId}
--
Gitblit v1.9.3