Commit e6d8d4e2 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 29e5020b e3163515
...@@ -82,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService { ...@@ -82,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService {
// 将Date转换为LocalDate // 将Date转换为LocalDate
LocalDate localDate = contractInfo.getContractStart().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate localDate = contractInfo.getContractStart().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
LocalDate prcExpLocalDate = localDate.plusMonths(6); // 加上6个月 // 加上6个月减一天
LocalDate prcExpLocalDate = localDate.plusMonths(6).minusDays(1);
// 将LocalDate转换回Date对象 // 将LocalDate转换回Date对象
Date prcExpDt = Date.from(prcExpLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date prcExpDt = Date.from(prcExpLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
// 试用期预计结束日期 // 试用期预计结束日期
gzEmpInfo.setPrcExpDt(prcExpDt); gzEmpInfo.setPrcExpDt(prcExpDt);
// 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“ // 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“
LocalDate probationDtLocalDate = prcExpLocalDate.plusDays(1); // 加上+1日(自然日) LocalDate probationDtLocalDate = prcExpLocalDate.plusDays(1);
// 将LocalDate转换回Date对象 // 将LocalDate转换回Date对象
Date probationDt = Date.from(probationDtLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date probationDt = Date.from(probationDtLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
// 预计转正日期 // 预计转正日期
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment