From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0
---
src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
index d615c7f..3685410 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
@@ -1,11 +1,8 @@
package com.ruoyi.staff.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffLeave;
import lombok.Data;
-
-import java.util.Date;
@Data
public class StaffLeaveDto extends StaffLeave {
@@ -45,48 +42,61 @@
/**
* 宀椾綅
*/
- @Excel(name = "宀椾綅",sort = 7)
+ @Excel(name = "閮ㄩ棬",sort = 7)
+ private String deptName;
+
+ /**
+ * 宀椾綅
+ */
+ @Excel(name = "宀椾綅",sort = 8)
private String postName;
/**
* 绗竴瀛﹀巻
*/
- @Excel(name = "绗竴瀛﹀巻", sort = 8)
+ @Excel(name = "绗竴瀛﹀巻", sort = 9)
private String firstStudy;
/**
* 涓撲笟
*/
- @Excel(name = "涓撲笟", sort = 9)
+ @Excel(name = "涓撲笟", sort = 10)
private String profession;
/**
* 韬唤璇佸彿鐮�
*/
- @Excel(name = "韬唤璇佸彿鐮�", sort = 10)
+ @Excel(name = "韬唤璇佸彿鐮�", sort = 11)
private String identityCard;
/**
* 骞撮緞
*/
- @Excel(name = "骞撮緞", sort = 11)
+ @Excel(name = "骞撮緞", sort = 12)
private String age;
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽", sort = 12)
+ @Excel(name = "鑱旂郴鐢佃瘽", sort = 13)
private String phone;
/**
* 绱ф�ヨ仈绯讳汉
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 13)
+ @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 14)
private String emergencyContact;
/**
* 绱ф�ヨ仈绯讳汉鐢佃瘽
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 14)
+ @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 15)
private String emergencyContactPhone;
+
+ private int count;
+
+ /**
+ * 绂昏亴鍘熷洜鏂囨湰
+ */
+ private String reasonText;
}
--
Gitblit v1.9.3