From 839cd39a9cfc49e5eaf73739549cf3f9e2725666 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 26 Oct 2021 21:56:24 +0800
Subject: [PATCH] 1.现场检查接口修改 2.车辆位置新增接口 3.成绩导出接口修改 4.公司信息接口修改,新增创建时间和创建人

---
 src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 a982e01..6dc19ae 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -23,10 +23,11 @@
 
     <select id="selectSeinspectPage" resultType="org.springblade.modules.seinspect.vo.SeinspectVO">
         select
-            ss.*,
+            ss.*,bu1.cardid cardId,
             bu.real_name realName,
             bd.dept_name examinerDeptName,
-            bu1.real_name securityName
+            bu1.real_name securityName,
+            bd1.dept_name securityDeptName
         from
             sys_seinspect ss
         left join
@@ -41,18 +42,22 @@
         blade_user bu1
         on
         bu1.id = ss.security_id
+        left join
+        blade_dept bd1
+        on
+        bd1.id = bu1.dept_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>
     </select>
 

--
Gitblit v1.9.3