Y0ng
/
gz_att_wechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

判断日期重复

This commit is contained in:
lSun 2025-10-25 14:28:18 +08:00
parent 5d0f12a6c1
commit 3f35d2a696
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
View File

@ -45,11 +45,11 @@ public class VerifyDateService {
String leaveType = dataMap.get("leaveType").toString();
String userName = dataMap.get("userName").toString();
if(type == 1){ // 出差
// sb.append("出行人：").append(userName).append("出行日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
sb.append("存在冲突日期");
sb.append("出行人：").append(userName).append("出行日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
// sb.append("存在冲突日期");
}else{ // 请假、轮休、外出
// sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("（").append(prominentDate).append("）");
sb.append("存在冲突日期");
sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("（").append(prominentDate).append("）");
// sb.append("存在冲突日期");
}
return sb.toString();
}else{

15
src/main/resources/mappers/wechat/VerifyDateMapper.xml
View File

@ -15,12 +15,15 @@
user_name AS userName
FROM leave_apply_wechat
WHERE user_id = #{params.userId} AND is_active = '1' and examine_status !='2'
AND (
CONCAT(DATE_FORMAT(leave_start_date, '%Y%m%d'),leave_start_interval) BETWEEN CONCAT(DATE_FORMAT(#{params.leaveStartDate}, '%Y%m%d'),#{params.leaveStartInterval}) AND
CONCAT(DATE_FORMAT(#{params.leaveEndDate}, '%Y%m%d'),#{params.leaveEndInterval}) OR
CONCAT(DATE_FORMAT(leave_end_date, '%Y%m%d'),leave_end_interval) BETWEEN CONCAT(DATE_FORMAT(#{params.leaveStartDate}, '%Y%m%d'),#{params.leaveStartInterval}) AND
CONCAT(DATE_FORMAT(#{params.leaveEndDate}, '%Y%m%d'),#{params.leaveEndInterval})
)
AND
<![CDATA[
TIMESTAMPADD(HOUR, (leave_end_interval - 1) * 12, leave_end_date) >= TIMESTAMPADD(HOUR, (#{params.leaveStartInterval} - 1) * 12, #{params.leaveStartDate})
]]>
AND
<![CDATA[
TIMESTAMPADD(HOUR, (leave_start_interval - 1) * 12, leave_start_date) <= TIMESTAMPADD(HOUR, (#{params.leaveEndInterval} - 1) * 12, #{params.leaveEndDate})
]]>
<if test="type == 1">
<if test="params.uuid!=null and params.uuid!=''">
AND leave_form_id != #{params.uuid}