From cf1f0bec9c3750f614b04eba843fda9e1cab9b67 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 12 三月 2026 13:21:49 +0800
Subject: [PATCH] yys 员工发工资增加离职和当月离职条件
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 1 +
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 2 +-
src/main/java/com/ruoyi/staff/pojo/StaffLeave.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
index 619bbc3..188081b 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
@@ -8,6 +8,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -27,6 +28,10 @@
@ApiModelProperty(value = "绂昏亴澶囨敞")
private String remark;
+ @ApiModelProperty(value = "绂昏亴鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
+ private LocalDate leaveDate;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index 8e4ce04..a3da111 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -90,6 +90,7 @@
String reason = staffLeaveDto.getReason();
leave.setReason(reason);
+ leave.setLeaveDate(staffLeaveDto.getLeaveDate());
// 鏍￠獙绂昏亴鍘熷洜鏄惁涓哄叾浠栵紝濡傛灉鏄叾浠栵紝澶囨敞璧嬪��
if (StaffLeaveReasonOther.getCode().equals(reason)){
leave.setRemark(staffLeaveDto.getRemark());
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 3093c63..26a34c1 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -162,7 +162,7 @@
if((Integer) id.get("staffState") == 0){
StaffLeave id1 = staffLeaveMapper.selectOne(new LambdaQueryWrapper<StaffLeave>()
.eq(StaffLeave::getStaffOnJobId, id.get("id"))
- .like(StaffLeave::getCreateTime, calculateSalaryDto.getDate()));
+ .like(StaffLeave::getLeaveDate, calculateSalaryDto.getDate()));
if(id1 == null){
continue;
}
--
Gitblit v1.9.3