From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'
---
src/main/resources/mapper/ds2/PunishmentMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/ds2/PunishmentMapper.xml b/src/main/resources/mapper/ds2/PunishmentMapper.xml
index f3ac57a..bad8e25 100644
--- a/src/main/resources/mapper/ds2/PunishmentMapper.xml
+++ b/src/main/resources/mapper/ds2/PunishmentMapper.xml
@@ -25,4 +25,25 @@
PM_GUID, PM_Name, PM_Time, PM_Reason, PM_Result, PM_Department, PM_Basis, PM_Scene_Id,
PM_Extension1, PM_Extension2, PM_Extension3, PM_Remark
</sql>
+
+ <resultMap id="PunishmentVo" type="cn.flightfeather.supervision.lightshare.vo.PunishmentVo" extends="BaseResultMap">
+ <association property="baseInfo" resultMap="cn.flightfeather.supervision.domain.ds2.mapper.BaseInfoMapper.BaseResultMap" />
+ </resultMap>
+
+ <select id="findPunishment" resultMap="PunishmentVo">
+ select
+ *
+ from ea_t_punishment as a
+ left join ea_t_baseinfo as b
+ on a.PM_Scene_Id = b.BI_GUID
+ <where>
+ a.PM_Scene_Id in #{tzUserIdList}
+ <if test="sTime != null">
+ and a.PM_Time >= #{sTime}
+ </if>
+ <if test="eTime != null">
+ and a.PM_Time <= #{eTime}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3