From f4e3872bd8d8d2f430c63d45509b1980139b200f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E5=AE=97=E9=87=91?= <1203338439@qq.com> Date: Sat, 11 Jan 2025 18:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=87=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/att/entity/AttDetailByMonthBean.java | 14 +++++++------- .../mapper/LeaveReporting/LeaveReportingMapper.xml | 8 ++++---- .../resources/mapper/evection/EvectionMapper.xml | 8 ++++---- .../mapper/wechat/WechatEvectionMapper.xml | 8 ++++---- .../mapper/wechat/WechatLeaveReportingMapper.xml | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDetailByMonthBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDetailByMonthBean.java index f60e183..58483df 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDetailByMonthBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDetailByMonthBean.java @@ -58,43 +58,43 @@ public class AttDetailByMonthBean { * 正常打卡天数 */ @Excel(name = "正常打卡天数") - private int normalNum; + private double normalNum; /** * 迟到次数 */ @Excel(name = "迟到次数") - private int lateNum; + private double lateNum; /** * 早退次数 */ @Excel(name = "早退次数") - private int earlyNum; + private double earlyNum; /** * 旷工次数 */ @Excel(name = "旷工次数") - private int skippingNum; + private double skippingNum; /** * 打卡地异常次数 */ @Excel(name = "打卡地异常次数") - private int addressErrorNum; + private double addressErrorNum; /** * 出入异常次数 */ @Excel(name = "出入异常次数") - private int einErrorNum; + private double einErrorNum; /** * 请假天数 */ @Excel(name = "请假天数") - private float leaveNum; + private double leaveNum; private int[] orgIds; diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml index 701c382..3b5f533 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml @@ -107,10 +107,10 @@ and l.user_id = #{params.userId} - and date_format(l.leave_start_date,'%y%m%d') >= date_format(#{params.params.beginTime},'%y%m%d') - - - and date_format(l.leave_end_date,'%y%m%d') <= date_format(#{params.params.endTime},'%y%m%d') + and ( + date_format(l.leave_start_date,'%y%m%d') between date_format(#{params.params.beginTime},'%y%m%d') and date_format(#{params.params.endTime},'%y%m%d') or + date_format(l.leave_end_date,'%y%m%d') between date_format(#{params.params.beginTime},'%y%m%d') and date_format(#{params.params.endTime},'%y%m%d') + ) GROUP BY l.id, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml index 86a3f84..2f9d23e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml @@ -114,10 +114,10 @@ and l.user_id = #{bean.userId} - and date_format(l.leave_start_date,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - - and date_format(l.leave_end_date,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + and ( + date_format(l.leave_start_date,'%y%m%d') between date_format(#{params.beginTime},'%y%m%d') and date_format(#{params.endTime},'%y%m%d') or + date_format(l.leave_end_date,'%y%m%d') between date_format(#{params.beginTime},'%y%m%d') and date_format(#{params.endTime},'%y%m%d') + ) GROUP BY l.id, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml index 56fda42..3bd3388 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml @@ -41,10 +41,10 @@ WHERE l.is_active = '1' AND l.leave_type = '出差' AND (l.source = '1' OR l.source = '3') - and date_format(l.leave_start_date,'%y%m%d') >= date_format(#{bean.params.beginTime},'%y%m%d') - - - and date_format(l.leave_end_date,'%y%m%d') <= date_format(#{bean.params.endTime},'%y%m%d') + and ( + date_format(l.leave_start_date,'%y%m%d') between date_format(#{bean.params.beginTime},'%y%m%d') and date_format(#{bean.params.endTime},'%y%m%d') or + date_format(l.leave_end_date,'%y%m%d') between date_format(#{bean.params.beginTime},'%y%m%d') and date_format(#{bean.params.endTime},'%y%m%d') + ) and l.org_id in ( diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml index 66488d3..9ea1182 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml @@ -33,10 +33,10 @@ WHERE l.is_active = '1' AND l.type = '请假' AND (l.source = '1' OR l.source = '3') - and date_format(l.leave_start_date,'%y%m%d') >= date_format(#{params.params.beginTime},'%y%m%d') - - - and date_format(l.leave_end_date,'%y%m%d') <= date_format(#{params.params.endTime},'%y%m%d') + and ( + date_format(l.leave_start_date,'%y%m%d') between date_format(#{params.params.beginTime},'%y%m%d') and date_format(#{params.params.endTime},'%y%m%d') or + date_format(l.leave_end_date,'%y%m%d') between date_format(#{params.params.beginTime},'%y%m%d') and date_format(#{params.params.endTime},'%y%m%d') + ) and l.org_id in (