From c6a33ee7ab133b3bcf5f377456b473c7bd4b9a77 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 19:57:38 +0800
Subject: [PATCH] 1.保安单位,保安人员现场检查字段修改,接口修改 2.成绩查询接口修改 3.保安员资格审查接口修改

---
 src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml |   71 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 17 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 d15ce89..cc71959 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -3,25 +3,62 @@
 <mapper namespace="org.springblade.modules.seinspect.mapper.SeinspectMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="seinspectResultMap" type="org.springblade.modules.seinspect.entity.Seinspect">
-        <id column="id" property="id"/>
-        <result column="realName" property="realname"/>
-        <result column="carid" property="carid"/>
-        <result column="sName" property="sname"/>
-        <result column="inspectman" property="inspectman"/>
-        <result column="deptName" property="deptname"/>
-        <result column="reviewTime" property="reviewtime"/>
-        <result column="insid" property="insid"/>
-        <result column="examination_type" property="examinationType"/>
-        <result column="jid" property="jid"/>
-        <result column="deptid" property="deptid"/>
-        <result column="jurisdiction" property="jurisdiction"/>
-        <result column="url" property="url"/>
-    </resultMap>
+<!--    <resultMap id="seinspectResultMap" type="org.springblade.modules.seinspect.entity.Seinspect">-->
+<!--        <id column="id" property="id"/>-->
+<!--        <result column="realName" property="realname"/>-->
+<!--        <result column="carid" property="carid"/>-->
+<!--        <result column="sName" property="sname"/>-->
+<!--        <result column="inspectman" property="inspectman"/>-->
+<!--        <result column="deptName" property="deptname"/>-->
+<!--        <result column="reviewTime" property="reviewtime"/>-->
+<!--        <result column="insid" property="insid"/>-->
+<!--        <result column="examination_type" property="examinationType"/>-->
+<!--        <result column="jid" property="jid"/>-->
+<!--        <result column="deptid" property="deptid"/>-->
+<!--        <result column="jurisdiction" property="jurisdiction"/>-->
+<!--        <result column="url" property="url"/>-->
+<!--    </resultMap>-->
 
 
-    <select id="selectSeinspectPage" resultMap="seinspectResultMap">
-        select * from sys_seinspect where is_deleted = 0
+    <select id="selectSeinspectPage" resultType="org.springblade.modules.seinspect.vo.SeinspectVO">
+        select
+        ss.*,
+        bu.real_name realName,
+        bd.dept_name examinerDeptName,
+        bu1.real_name securityName
+        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
+        where 1 = 1
+        <if test="seinspect.realName!=null and seinspect.realName!=''">
+            bu.real_name like concat('%',#{seinspect.realName},'%')
+        </if>
+        <if test="seinspect.examinerDeptName!=null and seinspect.examinerDeptName!=''">
+            bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
+        </if>
+        <if test="seinspect.securityName!=null and seinspect.securityName!=''">
+            bu1.real_name like concat('%',#{seinspect.securityName},'%')
+        </if>
+        <if test="seinspect.result!=null and seinspect.result!=''">
+            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>
     </select>
 
 </mapper>

--
Gitblit v1.9.3