From 2019d3ea4088eae51b5d52a2f6245841deb26781 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 19 七月 2023 15:05:43 +0800
Subject: [PATCH] 用户以及要素部分修改
---
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml
index c3ec6c8..5c68c7c 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml
@@ -25,6 +25,7 @@
from safety_self_inspection as a
left join user as b on a.inspector = b.id and b.isdel = 0
LEFT JOIN userroles as c on b.id = c.userid
+ left join company as co on a.checked_company_id = co.id
where a.valid_flag = 1
<if test="params.inspectionName != null and params.inspectionName != ''">
and a.inspection_name like concat("%",#{params.inspectionName},"%")
@@ -47,6 +48,15 @@
<if test="params.inspectionEndTime != null and params.inspectionEndTime != ''" >
and a.inspection_time <![CDATA[ <= ]]> #{params.inspectionEndTime}
</if>
+ <if test="params.province != null and params.province != ''" >
+ and co.province = #{params.province}
+ </if>
+ <if test="params.city != null and params.city != ''" >
+ and co.city = #{params.city}
+ </if>
+ <if test="params.area != null and params.area != ''" >
+ and co.area = #{params.area}
+ </if>
order by a.create_time desc
</select>
--
Gitblit v1.9.2