From ab4c3c88b079397de07ac5acd9692a976e9251ad Mon Sep 17 00:00:00 2001
From: Administrator <18380130276@163.com>
Date: Mon, 7 Apr 2025 15:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=92=89=E9=92=89=E7=9A=84?=
=?UTF-8?q?=E5=81=87=E6=9C=9F=E7=B1=BB=E5=9E=8B=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../model/AttendanceLeaveRecordEntity.java | 4 ++--
.../service/impl/DingPersonServiceImpl.java | 21 +++++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
index 27de6fa6..76de989a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
@@ -44,9 +44,9 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
@Excel(name = "鐢佃瘽鍙风爜")
private String phoneNumber;
/**
- * 璇峰亣绫诲瀷(1.浜嬪亣,2.璋冧紤,3.鐥呭亣,4.骞村亣,5.浜у亣,6.闄骇鍋�,7.濠氬亣,8.渚嬪亣,9.鍝轰钩鍋�,10.涓у亣,11.鍥炲崟浣�,12.鍥犲叕璇峰亣,13.澶栧嚭鍕橀獙,14.鍊肩彮琛ョ彮,15.浣撴,16.闅旂,17.鍥犲叕澶栧嚭,18.鍏紤,19.鑲插効鍋�,20.璋冨洖鍗曚綅,21.鎺翰鍋�,22.鍏朵粬,23=涓婂勾鍏紤缁撲綑)
+ * 璇峰亣绫诲瀷(1.浜嬪亣,2.璋冧紤,3.鐥呭亣,4.骞村亣,5.浜у亣,6.闄骇鍋�,7.濠氬亣,8.渚嬪亣,9.鍝轰钩鍋�,10.涓у亣,11.鍥炲崟浣�,12.鍥犲叕璇峰亣,13.澶栧嚭鍕橀獙,14.鍊肩彮琛ョ彮,15.浣撴,16.闅旂,17.鍥犲叕澶栧嚭,18.鍏紤,19.鑲插効鍋�,20.璋冨洖鍗曚綅,21.鎺翰鍋�,22.鍏朵粬,23=涓婂勾鍏紤缁撲綑,24=鐙敓瀛愬コ闄姢鍋�,25=闄姢鍋�,26=绋庡姟璋冧紤,27=绋庡姟骞村亣,28=绋庡姟闄骇鍋�,29=绋庡姟涓婂勾鍏紤缁撲綑,30=绋庡姟鑲插効鍋�)
*/
- @Excel(name = "璇峰亣绫诲瀷", readConverterExp = "1=浜嬪亣,2=璋冧紤,3=鐥呭亣,4=骞村亣,5=浜у亣,6=闄骇鍋�,7=濠氬亣,8=渚嬪亣,9=鍝轰钩鍋�,10=涓у亣,11=鍥炲崟浣�,12=鍥犲叕璇峰亣,13=澶栧嚭鍕橀獙,14=鍊肩彮琛ョ彮,15=浣撴,16=闅旂,17=鍥犲叕澶栧嚭,18=鍏紤,19=鑲插効鍋�,20=璋冨洖鍗曚綅,21=鎺翰鍋�,22=鍏朵粬,23=涓婂勾鍏紤缁撲綑")
+ @Excel(name = "璇峰亣绫诲瀷", readConverterExp = "1=浜嬪亣,2=璋冧紤,3=鐥呭亣,4=骞村亣,5=浜у亣,6=闄骇鍋�,7=濠氬亣,8=渚嬪亣,9=鍝轰钩鍋�,10=涓у亣,11=鍥炲崟浣�,12=鍥犲叕璇峰亣,13=澶栧嚭鍕橀獙,14=鍊肩彮琛ョ彮,15=浣撴,16=闅旂,17=鍥犲叕澶栧嚭,18=鍏紤,19=鑲插効鍋�,20=璋冨洖鍗曚綅,21=鎺翰鍋�,22=鍏朵粬,23=涓婂勾鍏紤缁撲綑,24=鐙敓瀛愬コ闄姢鍋�,25=闄姢鍋�,26=绋庡姟璋冧紤,27=绋庡姟骞村亣,28=绋庡姟闄骇鍋�,29=绋庡姟涓婂勾鍏紤缁撲綑,30=绋庡姟鑲插効鍋�")
private Integer leaveType;
/**
* 寮€濮嬫椂闂�
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
index 849d3690..c0652be9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
@@ -528,6 +528,27 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
case "涓婂勾鍏紤缁撲綑":
leaveRecordEntity.setLeaveType(23);
break;
+ case "鐙敓瀛愬コ闄姢鍋�":
+ leaveRecordEntity.setLeaveType(24);
+ break;
+ case "闄姢鍋�":
+ leaveRecordEntity.setLeaveType(25);
+ break;
+ case "绋庡姟璋冧紤":
+ leaveRecordEntity.setLeaveType(26);
+ break;
+ case "绋庡姟骞村亣":
+ leaveRecordEntity.setLeaveType(27);
+ break;
+ case "绋庡姟闄骇鍋�":
+ leaveRecordEntity.setLeaveType(28);
+ break;
+ case "绋庡姟涓婂勾鍏紤缁撲綑":
+ leaveRecordEntity.setLeaveType(29);
+ break;
+ case "绋庡姟鑲插効鍋�":
+ leaveRecordEntity.setLeaveType(30);
+ break;
default:
leaveRecordEntity.setLeaveType(22); //榛樿鍏朵粬
break;
--
2.24.3