From 26dffb27f9f2ea72facc8f5f30c9821987fad833 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Thu, 6 Mar 2025 10:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=96=E5=87=BA=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=9F=B9=E8=AE=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bonus/system/holiday/service/HolidayServiceImpl.java | 7 +++++++
.../src/main/resources/mapper/holiday/HolidayMapper.xml | 6 ++++++
2 files changed, 13 insertions(+)
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},