From e25ea374c7ef646cb2b83e7377198dab49903cd0 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 20 Mar 2025 13:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8E=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/system/att/service/AttCalServiceImpl.java | 6 +++--- .../bonus/system/download/ExportFileController.java | 2 +- .../system/holiday/controller/HolidayController.java | 6 ------ .../mapper/LeaveReporting/LeaveReportingMapper.xml | 2 +- .../src/main/resources/mapper/att/AttGroupMapper.xml | 4 ++-- .../main/resources/mapper/att/AttSourceDataMapper.xml | 10 +++++----- .../resources/mapper/att/AttendanceDetailsMapper.xml | 4 ++-- .../main/resources/mapper/att/WechatPushMapper.xml | 1 + .../main/resources/mapper/basic/SysNoticeMapper.xml | 2 +- .../src/main/resources/mapper/basic/SysOrgDao.xml | 11 ++++++----- .../src/main/resources/mapper/basic/SysUserMapper.xml | 2 +- .../main/resources/mapper/dept/ProDeptRoleMapper.xml | 1 + .../main/resources/mapper/evection/EvectionMapper.xml | 2 +- .../resources/mapper/holiday/WorkReportMapper.xml | 2 +- .../src/main/resources/mapper/wechat/WechatMapper.xml | 4 ++-- 15 files changed, 28 insertions(+), 31 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java index 2b022cd..bbe66cc 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java @@ -836,9 +836,9 @@ public class AttCalServiceImpl implements AttCalService { */ private void threadLeaveData(LeaveBean c) { //1.将请假区间变成日期集合 - if(c.getUserId() == 1){ - System.out.println("米娜"); - } +// if(c.getUserId() == 1){ +// System.out.println("米娜"); +// } List dateLists = AttTimeUtil.getStrDateListBetween(c.getLeaveStartDate(), c.getLeaveEndDate()); if (!dateLists.isEmpty()) { // //根据开始时间、结束时间获取节假日的日期集合 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java index ab78df9..757bb0b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java @@ -426,7 +426,7 @@ public class ExportFileController { writer.merge(rowNum + listData.size(), rowNum + listData.size() + 1, 0, 0, "说明", false); writer.merge(rowNum + listData.size(), rowNum + listData.size(), 1, 2 + days.size(), - "1.考勤记录：出勤记“√”，出差记“Δ”，年休假记“年”，探亲假记“探”，事假记“事”，法定假记“法”，病假记“病”，产假记“产”，婚假记“婚”，丧假记“丧”，育儿假记“育”，陪护假记“陪”，补休记“补”，旷工记“旷”，迟到记“迟”，早退记“退”，流产假记“流”，哺乳假记“哺”，节育假记“节”，父母护理假记“护”，其他记“其他”，省内工地记“工”，省外工地记“外”,未在考勤组记“/”,出差需在备注栏备注清楚出差地点。", false); + "1.考勤记录：出勤记“√”，出差记“Δ”，年休假记“年”，探亲假记“探”，事假记“事”，法定假记“法”，病假记“病”，产假记“产”，婚假记“婚”，丧假记“丧”，育儿假记“育”，陪护假记“陪”，补休记“补”，旷工记“旷”，迟到记“迟”，早退记“退”，流产假记“流”，哺乳假记“哺”，节育假记“节”，父母护理假记“护”，其他记“其他”，省内工地记“工”，省外工地记“外”,培训记“培”,未在考勤组记“/”,出差需在备注栏备注清楚出差地点。", false); writer.merge(rowNum + listData.size() + 1, rowNum + listData.size() + 1, 1, 2 + days.size(), "2.员工有关请假凭证，记录清楚准确，与本表于次月3日前一并报人力资源管理部门（专业分公司报送时间为30日前）。", false); writer.autoSizeColumn(3); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java index e60b98f..afc9b8f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java @@ -45,12 +45,6 @@ public class HolidayController extends BaseController { @Resource(name = "HolidayService") private HolidayService holidayService; - @Resource(name = "WorkReportDao") - private WorkReportDao dao; - - @Resource - private SysUserMapper userMapper; - @Resource(name = "ProDeptRoleDao") private ProDeptRoleDao proDeptRoleDao; 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 f478c92..590fc2a 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 @@ -181,7 +181,7 @@ UNION ALL SELECT su.user_id as userId , su.user_name as userName FROM sys_user su - LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id and su.user_id !=#{params.id} + LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1' and su.user_id !=#{params.id} WHERE 1=1 and suo.org_id in ( diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml index 705a141..29d0b5c 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml @@ -106,7 +106,7 @@ 0 AS attStatus, 1 AS attType FROM sys_user_org suo - WHERE user_id IN + WHERE suo.is_active = '1' and user_id IN #{item.userId} @@ -117,7 +117,7 @@ 0 AS attStatus, 2 AS attType FROM sys_user_org suo - WHERE user_id IN + WHERE suo.is_active = '1' and user_id IN #{item.userId} diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml index f22fe1a..f46de53 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml @@ -284,7 +284,7 @@ IFNULL(sum(IF(offWorkAttStatus = 26, 0.5, 0)), 0) AS outsideAttNum FROM v_att_update_data v LEFT JOIN sys_user su ON su.user_id = v.user_id - LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id + LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id and suo.is_active = '1' LEFT JOIN sys_organization so ON so.id = suo.org_id WHERE DATE_FORMAT(att_current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m') GROUP BY DATE_FORMAT(att_current_day, '%Y-%m'), @@ -409,7 +409,7 @@ '0' AS attStatus FROM att_setting_history ash LEFT JOIN sys_user su ON ash.user_id = su.user_id - left join sys_user_org suo ON su.user_id = suo.user_id + left join sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1' WHERE ash.current_day = #{pushDate} and suo.org_id is not null UNION @@ -421,7 +421,7 @@ '0' AS attStatus FROM att_setting_history ash LEFT JOIN sys_user su ON ash.user_id = su.user_id - left join sys_user_org suo ON su.user_id = suo.user_id + left join sys_user_org suo ON su.user_id = suo.user_id and suo.is_active = '1' WHERE ash.current_day = #{pushDate} and suo.org_id is not null @@ -476,7 +476,7 @@ DATE_FORMAT(#{pushDate}, '%Y-%m') as attCurrentMonth FROM att_setting_history ash LEFT JOIN sys_user su ON su.user_id = ash.user_id - LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id + LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id And suo.is_active= '1' LEFT JOIN sys_organization so ON so.id = suo.org_id WHERE DATE_FORMAT(ash.current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m') and suo.org_id is not null @@ -513,7 +513,7 @@ suo.org_id, so.org_name FROM sys_user su - LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id + LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id And suo.is_active= '1' LEFT JOIN sys_organization so ON so.id = suo.org_id where su.user_id = #{userId} diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml index f10fc9d..a874421 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml @@ -432,7 +432,7 @@ (select * FROM att_setting_history WHERE current_day = #{attCurrentDay}) ash LEFT JOIN sys_user su ON ash.user_id = su.user_id LEFT JOIN ( SELECT * FROM v_att_update_data WHERE att_current_day = #{attCurrentDay} ) v on su.user_id = v.user_id - LEFT JOIN sys_user_org org ON org.user_id = su.user_id + LEFT JOIN sys_user_org org ON org.user_id = su.user_id And suo.is_active= '1' LEFT JOIN sys_organization so ON so.id = org.org_id @@ -445,7 +445,7 @@ SELECT su.user_id FROM sys_user su LEFT JOIN v_att_update_data a ON a.user_id = su.user_id LEFT JOIN att_group_person_relation agpr ON agpr.user_id = su.user_id - LEFT JOIN sys_user_org org ON org.user_id = su.user_id + LEFT JOIN sys_user_org org ON org.user_id = su.user_id And suo.is_active= '1' left join sys_organization so on so.id = org.org_id WHERE su.is_active = 1 AND agpr.is_active = 1 AND att_current_day = #{attCurrentDay} diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml index 79c3516..a40772a 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml @@ -168,6 +168,7 @@ AND so.is_active = '1' WHERE suo.user_id = #{userId} + and suo.is_active = '1' LIMIT 1 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml index be1887a..c2a7ff2 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml @@ -140,7 +140,7 @@ FROM sys_organization WHERE id IN (SELECT org_id FROM sys_user_org - WHERE user_id = #{userId}) + WHERE user_id = #{userId} and is_active = '1')