From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 36f2757..fc24233 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -26,22 +26,49 @@
         <result column="deptid" property="deptid"/>
         <result column="permitime" property="permitime"/>
         <result column="ptype" property="ptype"/>
-        <result column="examinetime" property="examinetime"/>
         <result column="cardid" property="cardid"/>
         <result column="representativecell" property="representativecell"/>
         <result column="contacts" property="contacts"/>
         <result column="contactscell" property="contactscell"/>
         <result column="storage" property="storage"/>
         <result column="jurisdiction" property="jurisdiction"/>
+        <result column="papprove" property="papprove"/>
+        <result column="xapprove" property="xapprove"/>
+        <result column="sapprove" property="sapprove"/>
+        <result column="popinion" property="popinion"/>
+        <result column="xopinion" property="xopinion"/>
+        <result column="sopinion" property="sopinion"/>
+        <result column="overtime" property="overtime"/>
     </resultMap>
 
 
     <select id="selectRecordPage" resultMap="recordResultMap">
-        select * from sys_record
+        select * from sys_record si left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction where 1=1
+        <if test="record.ptype!=null and record.ptype!=''">
+            and ptype=#{record.ptype}
+        </if>
+        <if test="record.jurisdiction!=null and record.jurisdiction != '' and record.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction})
+        </if>
+        <if test="record.papprove!=null and record.papprove!=''">
+            and papprove=#{record.papprove}
+        </if>
+        <if test="record.xapprove!=null and record.xapprove!=''">
+            and xapprove=#{record.xapprove}
+        </if>
+        <if test="record.sapprove!=null and record.sapprove!=''">
+            and sapprove=#{record.sapprove}
+        </if>
     </select>
 
     <select id="selectIn" resultType="java.util.HashMap">
-        select * from sys_record where cardid=#{cardid} and ptype=#{type}
+        select *
+        from sys_record
+        where cardid = #{cardid}
+          and ptype = #{type}
     </select>
 
 </mapper>

--
Gitblit v1.9.3