From dc61b0c48dbcf1c085c1ec955450989105a4a14f Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 17 Feb 2022 16:19:52 +0800
Subject: [PATCH] 1. 辖区tree 接口新增修改 2. 材料上传接口修改,去除licet_id 3. 材料展示接口修改,对接大数据平台,通过读取请求头参数来返回相应的请求参数

---
 src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 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..d10d197 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,51 @@
 <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!=''">
+            and bu.real_name like concat('%',#{coinspect.realName},'%')
+        </if>
+        <if test="coinspect.examinerDeptName!=null and coinspect.examinerDeptName!=''">
+            and bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
+        </if>
+        <if test="coinspect.reviewedDeptName!=null and coinspect.reviewedDeptName!=''">
+            and bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
+        </if>
+        <if test="coinspect.results!=null and coinspect.results!=''">
+            and sc.results like concat('%',#{coinspect.results},'%')
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3