From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 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 5de605d..cdc38e2 100644
--- a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
+++ b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
@@ -3,19 +3,35 @@
<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"/>
+ <result column="penalty" property="penalty"/>
</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,
+ p.penalty
+ 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