diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java index 7e3e6c8..748f595 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java @@ -184,6 +184,13 @@ public class HolidayServiceImpl implements HolidayService { public int updateHoliday(HolidayBean o) { o.setUpdateUserId(SecurityUtils.getLoginUser().getSysUser().getUserId()); o.setExamineStatus("0"); + if("1".equals(o.getIsTrain())){ + o.setLeaveType("培训"); + o.setType(o.getLeaveType()); + }else if("0".equals(o.getIsTrain()) && "培训".equals(o.getType())){ + o.setLeaveType("临时外出"); + o.setType(o.getLeaveType()); + } int i = holidayDao.updateHoliday(o); Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId(); if (i > 0) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml index 61c0fd8..f9a7cdd 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml @@ -41,6 +41,12 @@ org_name = #{orgName}, + + leave_type = #{leaveType}, + + + `type` = #{type}, + leave_reason = #{leaveReason}, leave_start_date = #{leaveStartDate}, leave_start_interval = #{leaveStartInterval},