Commit a57601a5 authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 387cb5ee
...@@ -411,7 +411,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -411,7 +411,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (Common.isNotNull(dataR) if (Common.isNotNull(dataR)
&& Common.isNotNull(dataR.getData()) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())) { && Common.isNotNull(dataR.getData().getRegistDate())) {
preDispatchDate = dataR.getData().getRegistDate(); preDispatchDate = dataR.getData().getPriDisDate();
} else { } else {
return R.failed("获取最近工作日失败!"); return R.failed("获取最近工作日失败!");
} }
...@@ -594,22 +594,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -594,22 +594,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
R<TEmployeeInsuranceWorkDayVo> dataR; R<TEmployeeInsuranceWorkDayVo> dataR;
if (!currentTime.isBefore(LocalTime.of(15, 20)) && !currentTime.equals(LocalTime.of(15, 20))) { if (!currentTime.isBefore(LocalTime.of(15, 20)) && !currentTime.equals(LocalTime.of(15, 20))) {
//日期赋值 preDispatchDate = DateUtil.addDayByDate(preDispatchDate, 1);
dayVo = new TEmployeeInsuranceWorkDayVo(); }
dayVo.setType(CommonConstants.TWO_STRING); //日期赋值
dayVo.setRegistDate(preDispatchDate); dayVo = new TEmployeeInsuranceWorkDayVo();
try { dayVo.setType(CommonConstants.TWO_STRING);
dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo); dayVo.setRegistDate(preDispatchDate);
if (Common.isNotNull(dataR) try {
&& Common.isNotNull(dataR.getData()) dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
&& Common.isNotNull(dataR.getData().getRegistDate())) { if (Common.isNotNull(dataR)
preDispatchDate = dataR.getData().getRegistDate(); && Common.isNotNull(dataR.getData())
} else { && Common.isNotNull(dataR.getData().getRegistDate())) {
return R.failed("获取最近工作日失败!"); preDispatchDate = dataR.getData().getPriDisDate();
} } else {
}catch (Exception e){ return R.failed("获取最近工作日失败!");
return R.failed("获取最近工作日异常:"+e.getMessage());
} }
}catch (Exception e){
return R.failed("获取最近工作日异常:"+e.getMessage());
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
Map<String,TSettleDomainSelectVo> mapSelectVo = new HashMap<>(); Map<String,TSettleDomainSelectVo> mapSelectVo = new HashMap<>();
......
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