KPI / fw-morax

Commit 1d01b24ebf3a2be4497c15f468f44d0175dab93d

Authored by 姜超
1 parent dc3ff325

feature(*): 时间处理 

时间处理
Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/StaffSalaryVO.java
  View file @1d01b24
... ... @@ -5,6 +5,7 @@ import lombok.Data;
5 5  
6 6 import java.math.BigDecimal;
7 7 import java.time.LocalDate;
  8 +import java.time.LocalDateTime;
8 9 import java.time.YearMonth;
9 10 import java.util.List;
10 11  
... ... @@ -56,11 +57,11 @@ public class StaffSalaryVO {
56 57 /**
57 58 * 开始时间
58 59 */
59   - private LocalDate startTime;
  60 + private LocalDateTime startTime;
60 61 /**
61 62 * 开始时间
62 63 */
63   - private LocalDate endTime;
  64 + private LocalDateTime endTime;
64 65 /**
65 66 * 本月薪资(剩余应发)
66 67 */
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java
  View file @1d01b24
... ... @@ -186,7 +186,7 @@ public class SalaryPoolBizService {
186 186 private StaffSalaryVO getPoolDetail(SalaryPool pool) {
187 187 StaffSalaryVO vo = this.convertToSalaryVO(pool);
188 188 buildPoolData(pool, vo);
189   - LocalDate dataDate = vo.getEndTime();
  189 + LocalDate dataDate = LocalDate.from(vo.getEndTime());
190 190 List<SalaryPoolDetailVO> salaryDetailList = salaryPoolDetailService.queryByPoolId(pool.getId(), pool.getSalaryGroupId(), dataDate);
191 191 BV.isNotEmpty(salaryDetailList, () -> "该人员薪酬数据不存在");
192 192 Map<SalaryTypeEnum, List<SalaryPoolDetailVO>> salaryTypeMap = salaryDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetailVO::getType));
... ... @@ -209,14 +209,14 @@ public class SalaryPoolBizService {
209 209 salaryPool.getUserId(), salaryPool.getMonthly());
210 210 if (PublicUtil.isEmpty(salaryGroupUser)) {
211 211 log.error("员工薪酬池：{}，不存在绩效组人员数据", JSON.toJSONString(salaryPool));
212   - vo.setEndTime(PublicUtil.getYesterdayOrEndOfMonthDay(salaryPool.getMonthly()));
213   - vo.setStartTime(salaryPool.getMonthly().atDay(1));
  212 + vo.setEndTime(PublicUtil.getYesterdayOrEndOfMonthDay(salaryPool.getMonthly()).atTime(23, 59, 59));
  213 + vo.setStartTime(salaryPool.getMonthly().atDay(1).atTime(00, 00, 00));
214 214 return;
215 215 }
216   - vo.setEndTime(salaryGroupUser.getDataDate());
  216 + vo.setEndTime(salaryGroupUser.getDataDate().atTime(23, 59, 59));
217 217 SalaryGroupUser firstSalaryGroupUser = salaryGroupUserService.getMonthFirstData(salaryPool.getSgc(),
218 218 salaryPool.getUserId(), salaryPool.getMonthly());
219   - vo.setStartTime(firstSalaryGroupUser.getDataDate());
  219 + vo.setStartTime(firstSalaryGroupUser.getDataDate().atTime(00, 00, 00));
220 220 }
221 221  
222 222 /**
... ...