hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

考勤调整

Browse Source
This commit is contained in:
andy 2025-10-17 17:20:34 +08:00
parent 5098e35a20
commit b2de42d99a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evo-admin/src/main/java/com/evo/finance/domain/RzSalaryDetail.java
View File

@ -1,15 +1,13 @@
package com.evo.finance.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.evo.common.annotation.Excel;
import com.evo.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.evo.common.annotation.Excel;
import com.evo.common.core.domain.BaseEntity;
/**
* 工资详情对象 rz_salary_detail
*

2
evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java
View File

@ -204,7 +204,7 @@ public class RzLeaveDetailServiceImpl extends ServiceImpl<RzLeaveDetailMapper, R
RzLeaveDetail newRzLeaveDetail = new RzLeaveDetail();
BeanUtils.copyProperties(rzLeaveDetail, newRzLeaveDetail);
newRzLeaveDetail.setLeaveStartTime(firsDay);
newRzLeaveDetail.setLeaveStartTime(endDay);
newRzLeaveDetail.setLeaveEndTime(endDay);
extensionMap.put("month"+m.format(firsDay), ym.format(firsDay));
//如果只请1天, 则按照录入的时间计算, 如果
extensionMap.put("hours"+m.format(firsDay), calculationLeaveHour(newRzLeaveDetail).getLeaveHour());