From 024afbfeb399c4d800b4fa088149d92da4d8bbbf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 26 Sep 2024 16:03:08 +0800
Subject: [PATCH] 普查统计水库柱状图数据接口支持季节查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
index e82942b..cc795f1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
@@ -31,14 +31,18 @@
-- d.id as device_id,
-- d.device_name
, sppc.user_id
+ , sppc.id
, bu.real_name as userName
FROM
ywxt.sg_project_info pro
- LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
- Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type
+ inner JOIN ywxt.sg_device d ON pro.id = d.program_id
+ Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type or sgc.gx_device_type in ('sgzb','sgys')
left join ywxt.blade_role ro on ro.id = sgc.role_id
- left join ywxt.sg_project_person_config sppc on sppc.rold_id = sgc.role_id
+ left join ywxt.sg_project_person_config sppc on sgc.role_id = sppc.rold_id and sppc.program_id = pro.id
left join ywxt.blade_user bu on sppc.user_id = bu.id
where 1=1 and pro.id = #{dto.projectId}
</select>
+ <select id="getUserByRole" resultType="java.util.Map">
+ select id,real_name as realName from ywxt.blade_user where role_id = #{roleId}
+ </select>
</mapper>
--
Gitblit v1.9.3