From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 31c0d19..7bab072 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
@@ -5,10 +5,10 @@
<select id="queryPageList" resultType="cn.gistack.sm.sg.DO.SgProjectInfoDO">
select * from YWXT.SG_PROJECT_INFO info where 1=1
<if test="dto.projectName != null and dto.projectName != ''">
- and info.project_name = #{dto.projectName}
+ and info.project_name like concat( concat ('%',#{dto.projectName}),'%')
</if>
<if test="dto.skName != null and dto.skName != ''">
- and info.sk_name = #{dto.skName}
+ and info.sk_name like concat(concat('%',#{dto.skName}),'%')
</if>
</select>
<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
@@ -23,7 +23,10 @@
d.id as dId,
step.gx_step_name,
step.gx_step_num,
- re.STATUS
+ re.STATUS as reportStatus,
+ d.STATUS as deviceStatus,
+ pro.STATUS as projectStatus,
+ re.id as reportId
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -46,6 +49,12 @@
de.STATUS as deviceStatus
FROM
ywxt.sg_project_info pro
- LEFT JOIN ywxt.sg_device de ON pro.id = de.program_id
+ LEFT JOIN ywxt.sg_device de ON pro.id = de.program_id where 1=1
+ <if test="dto.status != null">
+ and pro.status = #{dto.status}
+ </if>
+ <if test="dto.projectName != null and dto.projectName != ''">
+ and pro.project_name like CONCAT(CONCAT('%',#{dto.projectName}),'%')
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3