From e8e7a6ea6943d8289aa9b0f14d5474184d3254fe Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 6 Mar 2025 17:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E8=80=83=E5=8B=A4=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/system/att/dao/AttSourceDataDao.java | 2 +- .../java/com/bonus/system/att/entity/AttMonthReportBean.java | 2 +- .../main/java/com/bonus/system/att/service/AttCalService.java | 4 ++-- .../com/bonus/system/att/service/AttGroupServiceImpl.java | 2 +- .../com/bonus/system/basic/controller/SysUserController.java | 2 -- .../bonus/system/basic/service/impl/SysUserServiceImpl.java | 4 ---- .../java/com/bonus/system/download/ExportFileController.java | 3 ++- .../src/main/resources/mapper/att/AttSourceDataMapper.xml | 4 ++-- .../src/main/resources/mapper/basic/SysUserMapper.xml | 4 ++-- 9 files changed, 11 insertions(+), 16 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java index 65c3fdc..18cfa7b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java @@ -225,7 +225,7 @@ public interface AttSourceDataDao { * @param nowDate * @param i */ - void updateMonthReportRequiredDay(@Param("userId") String userId, @Param("nowDate") String nowDate, @Param("requiredDays") Long requiredDays, @Param("requiredDaysRemark") String requiredDaysRemark); + void updateMonthReportRequiredDay(@Param("userId") String userId, @Param("nowDate") String nowDate, @Param("requiredDays") Long requiredDays, @Param("requiredDayRemark") String requiredDayRemark); /** * 查询考勤人员基础数据 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttMonthReportBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttMonthReportBean.java index 3b9f5b8..95ff0c6 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttMonthReportBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttMonthReportBean.java @@ -145,5 +145,5 @@ public class AttMonthReportBean { private String endMonth; /**考勤组成卑职*/ - private String requiredDaysRemark; + private String requiredDayRemark; } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java index 9461862..76cbaf1 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java @@ -103,9 +103,9 @@ public interface AttCalService { * @param userId * @param nowDate * @param i - * @param requiredDaysRemark + * @param requiredDayRemark */ - void updateMonthReportRequiredDay(String userId, String nowDate, Long i, String requiredDaysRemark); + void updateMonthReportRequiredDay(String userId, String nowDate, Long i, String requiredDayRemark); /** * 月半才第一次加入考勤组 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttGroupServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttGroupServiceImpl.java index 256743d..3ffc746 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttGroupServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttGroupServiceImpl.java @@ -226,7 +226,7 @@ public class AttGroupServiceImpl implements AttGroupService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); String currentYearMonth = sdf.format(new Date()); list.get(0).setAttCurrentMonth(currentYearMonth); - list.get(0).setRequiredDaysRemark(requiredDaysRemark.toString()); + list.get(0).setRequiredDayRemark(requiredDaysRemark.toString()); attCalService.insertMonthHalfReportTempData(list); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index 111c4fb..ba6c0c8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -189,9 +189,7 @@ public class SysUserController extends BaseController { return error("修改用户'" + user.getUserName() + "'失败，用户名已存在"); } user.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getUserId())); - // 修改leave_apply中的org_id - return toAjax(userService.updateUser(user)); } catch (Exception e) { logger.error(e.toString(),e); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java index 15297ea..0bdb925 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java @@ -309,8 +309,6 @@ public class SysUserServiceImpl implements SysUserService //删除用户与组织关联 //旧组织 Long[] orgIdsByUserId = userMapper.getOrgIdsByUserId(userId); - //新组织 - Long[] orgIds = user.getOrgIds(); userMapper.deleteUserOrgByUserId(userId); insertUserOrg(user); //处理人员组织变更，休假/外出/等审批组织 @@ -391,9 +389,7 @@ public class SysUserServiceImpl implements SysUserService * @param user 退出组织的用户信息，包含用户ID等必要数据 */ private void dealOrgUserLeave(Long[] orgIdsByUserId, SysUser user) { - //比较老旧组织的是否发生改变 - Map oldOrgArray = arrayToMapUsingElementToList(orgIdsByUserId); Map newOrgArray = arrayToMapUsingElementToList(user.getOrgIds()); boolean isSame = compareSameMaps(oldOrgArray, newOrgArray); 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 60667e6..fd971e2 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 @@ -676,7 +676,7 @@ public class ExportFileController { List attDayReportList = attendanceDetailsService.getAttMonthReportList(bean); Sheet departmentSheet1 = exporter.createSheet("月报表详情"); List departmentHeaders1 = Arrays.asList("序号", "姓名", "所属部门", "考勤月","打卡记录", "应考勤天数", "正常打卡天数", - "迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数", "培训天数", "外勤天数"); + "迟到天数", "早退天数", "旷工天数", "请假天数", "打卡地异常天数", "出入异常天数", "轮休天数", "临时外出天数", "出差天数", "培训天数", "外勤天数", "考勤天数备注"); exporter.addHeaderRowAndTitle(departmentSheet1, departmentHeaders1, title); List> departmentData1 = new ArrayList<>(); for (int i = 0; i < attDayReportList.size(); i++) { @@ -699,6 +699,7 @@ public class ExportFileController { map.put("出差天数", attDayReportList.get(i).getBusinessTripNum()); map.put("培训天数", attDayReportList.get(i).getTrainNum()); map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum()); + map.put("考勤天数备注", attDayReportList.get(i).getRequiredDayRemark()); departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); 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 c3e59dd..ac3cc03 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 @@ -72,7 +72,7 @@ values (#{params.userId}, #{params.userName}, #{params.orgId}, #{params.orgName}, - #{params.attCurrentMonth}, #{params.requiredDays}, #{params.requiredDaysRemark} + #{params.attCurrentMonth}, #{params.requiredDays}, #{params.requiredDayRemark} ) @@ -182,7 +182,7 @@ update att_month_report - set required_days = #{requiredDays},required_day_remark = #{requiredDaysRemark} + set required_days = #{requiredDays},required_day_remark = #{requiredDayRemark} where user_id = #{userId} and att_current_month = DATE_FORMAT(#{nowDate}, '%Y-%m') 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 3b96bd8..be1887a 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 @@ -42,8 +42,8 @@ - delete - from sys_user_org + update sys_user_org + set is_active = '0' where user_id = #{userId}