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/coinspect/mapper/CoinspectMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
index ee0b701..9081ab9 100644
--- a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
@@ -3,19 +3,57 @@
 <mapper namespace="org.springblade.modules.coinspect.mapper.CoinspectMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="coinspectResultMap" type="org.springblade.modules.coinspect.entity.Coinspect">
+    <resultMap id="coinspectResultMap" type="org.springblade.modules.coinspect.vo.CoinspectVO">
         <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="sName" property="sname"/>
-        <result column="deptName" property="deptname"/>
+        <result column="examiner_id" property="examinerId"/>
+        <result column="reviewed_dept_id" property="reviewedDeptId"/>
+        <result column="examiner_dept_id" property="examinerDeptId"/>
         <result column="reviewTime" property="reviewtime"/>
         <result column="insid" property="insid"/>
         <result column="results" property="results"/>
+        <result column="url" property="url"/>
     </resultMap>
 
 
-    <select id="selectCoinspectPage" resultMap="coinspectResultMap">
-        select * from sys_coinspect where is_deleted = 0
+    <select id="selectCoinspectPage" resultType="org.springblade.modules.coinspect.vo.CoinspectVO">
+        select
+        sc.*,
+        bu.real_name realName,
+        bd.dept_name examinerDeptName,
+        bd1.dept_name reviewedDeptName
+        from
+        sys_coinspect sc
+        left join
+        blade_user bu
+        on
+        bu.id = sc.examiner_id
+        left join
+        blade_dept bd
+        on
+        bd.id = sc.examiner_dept_id
+        left join
+        blade_dept bd1
+        on
+        bd1.id = sc.reviewed_dept_id
+        where 1 = 1
+        <if test="coinspect.realName!=null and coinspect.realName!=''">
+            bu.real_name like concat('%',#{coinspect.realName},'%')
+        </if>
+        <if test="coinspect.examinerDeptName!=null and coinspect.examinerDeptName!=''">
+            bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
+        </if>
+        <if test="coinspect.reviewedDeptName!=null and coinspect.reviewedDeptName!=''">
+            bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
+        </if>
+        <if test="coinspect.results!=null and coinspect.results!=''">
+            sc.results like concat('%',#{coinspect.results},'%')
+        </if>
+        <if test="coinspect.startTime!=null and coinspect.startTime!=''">
+            and sc.reviewTime &gt;= #{coinspect.startTime}
+        </if>
+        <if test="coinspect.endTime!=null and coinspect.endTime!=''">
+            and sc.reviewTime &lt;= #{coinspect.endTime}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3