Commit d73818dd authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 0fec7a62
...@@ -211,12 +211,12 @@ public class TEmployeeContractPreController { ...@@ -211,12 +211,12 @@ public class TEmployeeContractPreController {
} }
/** /**
* 派单当日8点30分统一推送确认信息 * 派单当日9点统一推送确认信息
* @author huych * @author huych
* @date 2025-06-16 11:26:16 * @date 2025-06-16 11:26:16
* @return void * @return void
*/ */
@SysLog("派单当日8点30分统一推送确认信息") @SysLog("派单当日9点统一推送确认信息")
@Inner @Inner
@PostMapping("/inner/pushWxConfrimMessage") @PostMapping("/inner/pushWxConfrimMessage")
public void pushWxConfrimMessage() { public void pushWxConfrimMessage() {
...@@ -224,12 +224,12 @@ public class TEmployeeContractPreController { ...@@ -224,12 +224,12 @@ public class TEmployeeContractPreController {
} }
/** /**
* 每天上午9点推送待派单数据 * 每天15.00/15.20点推送待派单数据
* @author huych * @author huych
* @date 2025-06-16 14:18:26 * @date 2025-06-16 14:18:26
* @return void * @return void
*/ */
@SysLog("每天上午9点推送待派单数据") @SysLog("每天15.00/15.20点推送待派单数据")
@Inner @Inner
@PostMapping("/inner/pushDisConfrimContracts") @PostMapping("/inner/pushDisConfrimContracts")
public void pushDisConfrimContracts() { public void pushDisConfrimContracts() {
......
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_employee_contract_pre a FROM t_employee_contract_pre a
where a.process_status = '0' and a.expected_confirm_time is not null where a.process_status = '0' and a.expected_confirm_time is not null
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") = CURDATE() and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
group by a.customer_user_loginname group by a.customer_user_loginname
</select> </select>
......
...@@ -1728,14 +1728,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1728,14 +1728,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setRegistDate(preVo.getJoinLeaveDate()); vo.setRegistDate(preVo.getJoinLeaveDate());
Date date = this.addYearsMonths(vo); Date date = this.addYearsMonths(vo);
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.THREE_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
dayVo.setRegistType(0); dayVo.setRegistType(0);
R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo); R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getContractAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData()) if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getPriDisDate())) { && Common.isNotNull(dataR.getData().getRegistDate())) {
preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate()); preVo.setExpectedCollectionTime(dataR.getData().getRegistDate());
preVo.setExpectedConfirmTime(dataR.getData().getPriDisDate()); preVo.setExpectedConfirmTime(dataR.getData().getRegistDate());
} else { } else {
preVo.setExpectedCollectionTime(date); preVo.setExpectedCollectionTime(date);
preVo.setExpectedConfirmTime(date); preVo.setExpectedConfirmTime(date);
......
...@@ -86,19 +86,19 @@ public class ArchiveTask { ...@@ -86,19 +86,19 @@ public class ArchiveTask {
} }
public void pushWxContractConfrimMessage() { public void pushWxContractConfrimMessage() {
log.info("-------------每天8.30推送合同待签订信息------------"); log.info("-------------每天9点推送合同待签订信息------------");
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(), HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
"/temployeecontractpre/inner/pushWxConfrimMessage", "", Object.class, "/temployeecontractpre/inner/pushWxConfrimMessage", "", Object.class,
SecurityConstants.FROM_IN); SecurityConstants.FROM_IN);
log.info("-------------每天8.30推送合同待签订信息-定时任务开始------------"); log.info("-------------每天9点推送合同待签订信息-定时任务开始------------");
} }
public void pushDisConfrimContracts() { public void pushDisConfrimContracts() {
log.info("-------------每天9点推送合同待签订信息------------"); log.info("-------------每天15.00/15.20点推送合同待签订信息------------");
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(), HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
"/temployeecontractpre/inner/pushDisConfrimContracts", "", Object.class, "/temployeecontractpre/inner/pushDisConfrimContracts", "", Object.class,
SecurityConstants.FROM_IN); SecurityConstants.FROM_IN);
log.info("-------------每天9点推送合同待签订信息-定时任务开始------------"); log.info("-------------每天15.00/15.20点推送合同待签订信息-定时任务开始------------");
} }
public void everyDayCreateRiskMonitor() { public void everyDayCreateRiskMonitor() {
......
...@@ -212,13 +212,13 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -212,13 +212,13 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
vo.setRegistDate(preVo.getJoinLeaveDate()); vo.setRegistDate(preVo.getJoinLeaveDate());
Date date = this.addYearsMonths(vo); Date date = this.addYearsMonths(vo);
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.THREE_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
dayVo.setRegistType(0); dayVo.setRegistType(0);
TEmployeeInsuranceWorkDayVo dataR = tHolidayInfoService.getInitBeforeOrAfterWorkDay(dayVo); TEmployeeInsuranceWorkDayVo dataR = tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getPriDisDate())) { if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getPriDisDate())) {
preVo.setExpectedCollectionTime(dataR.getPriDisDate()); preVo.setExpectedCollectionTime(dataR.getRegistDate());
preVo.setExpectedConfirmTime(dataR.getPriDisDate()); preVo.setExpectedConfirmTime(dataR.getRegistDate());
} else { } else {
preVo.setExpectedCollectionTime(date); preVo.setExpectedCollectionTime(date);
preVo.setExpectedConfirmTime(date); preVo.setExpectedConfirmTime(date);
......
...@@ -321,21 +321,43 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -321,21 +321,43 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
// 转回Date类型 // 转回Date类型
vo.setRegistDate(Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant())); vo.setRegistDate(Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
//判断传入日期是否大于今天 //查找入职日期的后一个工作日
getWorkDay(holidayMap, vo);
//判断后一个工作日是否大于今天
LocalDate givenLocalDate = vo.getRegistDate().toInstant() LocalDate givenLocalDate = vo.getRegistDate().toInstant()
.atZone(java.time.ZoneId.systemDefault()) .atZone(java.time.ZoneId.systemDefault())
.toLocalDate(); .toLocalDate();
// 获取今天的 LocalDate // 获取今天的 LocalDate
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
// 判断给定日期是否小于今天,日期小于今天则返回今天 LocalTime currentTime = LocalTime.now();
if (givenLocalDate.isBefore(today) || givenLocalDate.isEqual(today)) { if (givenLocalDate.isBefore(today) || givenLocalDate.isEqual(today)) {
//判断是否是工作日 // 如果日期后一个工作日日期小于等于今天
if (currentTime.isBefore(LocalTime.of(15, 20)) || currentTime.equals(LocalTime.of(15, 20))) {
// 如果当前时间在15:20之前
//判断当前时间是否为非工作日,如果是的话,预派时间需要为下个工作日
if (null != holidayMap.get(LocalDateTimeUtils.convertLDToDate(today))) {
TEmployeeInsuranceWorkDayVo newVoUnWork = new TEmployeeInsuranceWorkDayVo();
newVoUnWork.setRegistDate(LocalDateTimeUtils.convertLDToDate(today));
newVoUnWork.setType(CommonConstants.TWO_STRING);
getWorkDay(holidayMap, newVoUnWork);
vo.setRegistDate(newVoUnWork.getRegistDate());
} else {
vo.setRegistDate(LocalDateTimeUtils.convertLDToDate(today)); vo.setRegistDate(LocalDateTimeUtils.convertLDToDate(today));
} }
if (Boolean.TRUE.equals(checkIsWorkDay(vo))){ } else {
//非工作日找下一个工作日 // 如果当前时间在15:20之后
getWorkDay(holidayMap,vo); TEmployeeInsuranceWorkDayVo afterVo = new TEmployeeInsuranceWorkDayVo();
return vo; afterVo.setRegistDate(DateUtil.addDayByDate(LocalDateTimeUtils.convertLDToDate(today), CommonConstants.ONE_INT));
afterVo.setType(CommonConstants.TWO_STRING);
getWorkDay(holidayMap, afterVo);
vo.setRegistDate(afterVo.getRegistDate());
}
} else {
//如果后一个工作日日期大于今天
//预计派单日期
vo.setRegistDate(vo.getRegistDate());
} }
return vo; return vo;
} }
...@@ -359,13 +381,10 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -359,13 +381,10 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
.atZone(java.time.ZoneId.systemDefault()) .atZone(java.time.ZoneId.systemDefault())
.toLocalDate(); .toLocalDate();
//查找入职日期的前一个/后一个工作日 //查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo newVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo newVo = new TEmployeeInsuranceWorkDayVo();
newVo.setRegistDate(DateUtil.addDayByDate(vo.getRegistDate(), newVo.setRegistDate(DateUtil.addDayByDate(vo.getRegistDate(), CommonConstants.ONE_INT_NEGATE));
null != vo.getType() && CommonConstants.THREE_STRING.equals(vo.getType()) ? newVo.setType(CommonConstants.ONE_STRING);
CommonConstants.ZERO_INT : CommonConstants.ONE_INT_NEGATE));
newVo.setType(null != vo.getType() && CommonConstants.THREE_STRING.equals(vo.getType()) ?
CommonConstants.TWO_STRING : CommonConstants.ONE_STRING);
getWorkDay(holidayMap, newVo); getWorkDay(holidayMap, newVo);
//判断前一个工作日是否大于今天 //判断前一个工作日是否大于今天
......
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