bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改假期，节假日定时器

This commit is contained in:
史宗金 2025-01-11 18:41:17 +08:00
parent 9457ff7b21
commit f4e3872bd8
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDetailByMonthBean.java
View File

@ -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;

8
bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml
View File

@ -107,10 +107,10 @@
and l.user_id = #{params.userId}
</if>
<if test="params.params.beginTime != null and params.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(l.leave_start_date,'%y%m%d') &gt;= date_format(#{params.params.beginTime},'%y%m%d')
</if>
<if test="params.params.endTime != null and params.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(l.leave_end_date,'%y%m%d') &lt;= 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')
)
</if>
GROUP BY
l.id,

8
bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
View File

@ -114,10 +114,10 @@
and l.user_id = #{bean.userId}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
and date_format(l.leave_start_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''">
and date_format(l.leave_end_date,'%y%m%d') &lt;= 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')
)
</if>
GROUP BY
l.id,

8
bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml
View File

@ -41,10 +41,10 @@
WHERE
l.is_active = '1' AND l.leave_type = '出差' AND (l.source = '1' OR l.source = '3')
<if test="bean.params.beginTime != null and bean.params.beginTime != ''">
and date_format(l.leave_start_date,'%y%m%d') &gt;= date_format(#{bean.params.beginTime},'%y%m%d')
</if>
<if test="bean.params.endTime != null and bean.params.endTime != ''">
and date_format(l.leave_end_date,'%y%m%d') &lt;= 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')
)
</if>
<if test='bean.orgList != null and bean.orgList.size() > 0'>
and l.org_id in (

8
bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml
View File

@ -33,10 +33,10 @@
WHERE
l.is_active = '1' AND l.type = '请假' AND (l.source = '1' OR l.source = '3')
<if test="params.params.beginTime != null and params.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(l.leave_start_date,'%y%m%d') &gt;= date_format(#{params.params.beginTime},'%y%m%d')
</if>
<if test="params.params.endTime != null and params.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(l.leave_end_date,'%y%m%d') &lt;= 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')
)
</if>
<if test='params.orgList != null and params.orgList.size() > 0'>
and l.org_id in (