diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/StaffSalaryVO.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/StaffSalaryVO.java index 886e0c5..11465b4 100644 --- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/StaffSalaryVO.java +++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/StaffSalaryVO.java @@ -5,6 +5,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.YearMonth; import java.util.List; @@ -56,11 +57,11 @@ public class StaffSalaryVO { /** * 开始时间 */ - private LocalDate startTime; + private LocalDateTime startTime; /** * 开始时间 */ - private LocalDate endTime; + private LocalDateTime endTime; /** * 本月薪资(剩余应发) */ diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java index e981b30..ebb4c20 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java @@ -186,7 +186,7 @@ public class SalaryPoolBizService { private StaffSalaryVO getPoolDetail(SalaryPool pool) { StaffSalaryVO vo = this.convertToSalaryVO(pool); buildPoolData(pool, vo); - LocalDate dataDate = vo.getEndTime(); + LocalDate dataDate = LocalDate.from(vo.getEndTime()); List salaryDetailList = salaryPoolDetailService.queryByPoolId(pool.getId(), pool.getSalaryGroupId(), dataDate); BV.isNotEmpty(salaryDetailList, () -> "该人员薪酬数据不存在"); Map> salaryTypeMap = salaryDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetailVO::getType)); @@ -209,14 +209,14 @@ public class SalaryPoolBizService { salaryPool.getUserId(), salaryPool.getMonthly()); if (PublicUtil.isEmpty(salaryGroupUser)) { log.error("员工薪酬池:{},不存在绩效组人员数据", JSON.toJSONString(salaryPool)); - vo.setEndTime(PublicUtil.getYesterdayOrEndOfMonthDay(salaryPool.getMonthly())); - vo.setStartTime(salaryPool.getMonthly().atDay(1)); + vo.setEndTime(PublicUtil.getYesterdayOrEndOfMonthDay(salaryPool.getMonthly()).atTime(23, 59, 59)); + vo.setStartTime(salaryPool.getMonthly().atDay(1).atTime(00, 00, 00)); return; } - vo.setEndTime(salaryGroupUser.getDataDate()); + vo.setEndTime(salaryGroupUser.getDataDate().atTime(23, 59, 59)); SalaryGroupUser firstSalaryGroupUser = salaryGroupUserService.getMonthFirstData(salaryPool.getSgc(), salaryPool.getUserId(), salaryPool.getMonthly()); - vo.setStartTime(firstSalaryGroupUser.getDataDate()); + vo.setStartTime(firstSalaryGroupUser.getDataDate().atTime(00, 00, 00)); } /**