yys 员工发工资增加离职和当月离职条件

maven

2 天以前 cf1f0bec9c3750f614b04eba843fda9e1cab9b67

yys  员工发工资增加离职和当月离职条件

 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;

 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());

 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;
                }