From 30b3905e88495611704e356a1d3ced094e2a503d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 25 Oct 2021 16:56:16 +0800
Subject: [PATCH] 1.登录返回数据修改 2.现场检查接口修改

---
 src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
index cc71959..f6c464e 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -42,16 +42,16 @@
         bu1.id = ss.security_id
         where 1 = 1
         <if test="seinspect.realName!=null and seinspect.realName!=''">
-            bu.real_name like concat('%',#{seinspect.realName},'%')
+            and bu.real_name like concat('%',#{seinspect.realName},'%')
         </if>
         <if test="seinspect.examinerDeptName!=null and seinspect.examinerDeptName!=''">
-            bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
+            and bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
         </if>
         <if test="seinspect.securityName!=null and seinspect.securityName!=''">
-            bu1.real_name like concat('%',#{seinspect.securityName},'%')
+            and bu1.real_name like concat('%',#{seinspect.securityName},'%')
         </if>
         <if test="seinspect.result!=null and seinspect.result!=''">
-            ss.result like concat('%',#{seinspect.result},'%')
+            and ss.result like concat('%',#{seinspect.result},'%')
         </if>
         <if test="seinspect.startTime!=null and seinspect.startTime!=''">
             and ss.reviewTime &gt;= #{seinspect.startTime}
@@ -61,4 +61,61 @@
         </if>
     </select>
 
+
+    <select id="exportSeinspect" resultType="org.springblade.modules.seinspect.excel.SeinspectExcel">
+        select
+        bu1.real_name securityName,
+        bu.real_name realName,
+        bd.dept_name examinerDeptName,
+        ss.reviewTime reviewtime,
+        ss.content,
+        ss.result
+        from
+        sys_seinspect ss
+        left join
+        blade_user bu
+        on
+        bu.id = ss.examiner_id
+        left join
+        blade_dept bd
+        on
+        bd.id = ss.examiner_dept_id
+        left join
+        blade_user bu1
+        on
+        bu1.id = ss.security_id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = ss.jurisdiction
+        where 1 = 1
+        <if test="seinspect.jurisdiction!=null and seinspect.jurisdiction!='' and seinspect.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{seinspect.jurisdiction} or sj.parent_id = #{seinspect.jurisdiction})
+        </if>
+        <if test="seinspect.realName!=null and seinspect.realName!=''">
+            and bu.real_name like concat('%',#{seinspect.realName},'%')
+        </if>
+        <if test="seinspect.examinerDeptName!=null and seinspect.examinerDeptName!=''">
+            and bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
+        </if>
+        <if test="seinspect.securityName!=null and seinspect.securityName!=''">
+            and bu1.real_name like concat('%',#{seinspect.securityName},'%')
+        </if>
+        <if test="seinspect.result!=null and seinspect.result!=''">
+            and ss.result like concat('%',#{seinspect.result},'%')
+        </if>
+        <if test="seinspect.startTime!=null and seinspect.startTime!=''">
+            and ss.reviewTime &gt;= #{seinspect.startTime}
+        </if>
+        <if test="seinspect.endTime!=null and seinspect.endTime!=''">
+            and ss.reviewTime &lt;= #{seinspect.endTime}
+        </if>
+        <if test="seinspect.reviewtime!=null and seinspect.reviewtime!=''">
+            and ss.reviewTime &lt;= #{seinspect.reviewtime}
+        </if>
+
+    </select>
+
+
+
 </mapper>

--
Gitblit v1.9.3