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,6 +594,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -594,6 +594,8 @@ 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 = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
...@@ -603,14 +605,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -603,14 +605,13 @@ 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("获取最近工作日失败!");
} }
}catch (Exception e){ }catch (Exception e){
return R.failed("获取最近工作日异常:"+e.getMessage()); 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<>();
Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user,autoFlag,mapSelectVo); Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user,autoFlag,mapSelectVo);
......
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