From 4083f89a6f65502bbca1fb77f59a9b77aa52fb28 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 16:04:35 +0800
Subject: [PATCH] 1.首页接口

---
 src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
index a78ee85..285b840 100644
--- a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
+++ b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
@@ -3,20 +3,33 @@
 <mapper namespace="org.springblade.modules.punish.mapper.PunishMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="punishResultMap" type="org.springblade.modules.punish.entity.Punish">
-        <id column="id" property="id"/>
-        <result column="deptid" property="deptid"/>
+    <resultMap id="punishResultMap" type="org.springblade.modules.punish.vo.PunishVO">
         <result column="punishtype" property="punishtype"/>
         <result column="punishreason" property="punishreason"/>
         <result column="punishresult" property="punishresult"/>
         <result column="punishtime" property="punishtime"/>
         <result column="punisnum" property="punisnum"/>
         <result column="jurisdiction" property="jurisdiction"/>
+        <result column="enterpriseName" property="enterpriseName"/>
+        <result column="jurname" property="jurname"/>
     </resultMap>
 
 
     <select id="selectPunishPage" resultMap="punishResultMap">
-        select * from sys_punish
+        SELECT i.enterpriseName,
+               j.dept_name as jurname,
+               p.punishtype,
+               p.punishreason,
+               p.punishresult,
+               p.punishtime,
+               p.punisnum
+        FROM sys_punish p
+                 LEFT JOIN sys_information i ON i.departmentid = p.deptid
+                 LEFT JOIN sys_jurisdiction j ON j.id = p.jurisdiction
+        where 1=1
+        <if test="punish.jurisdiction!=null and punish.jurisdiction!='' and punish.jurisdiction!='1123598813738675201'">
+            and  p.jurisdiction = #{punish.jurisdiction}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3