Commit 5bd384c2 authored by hongguangwu's avatar hongguangwu

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

parents ee036353 4dbf120c
......@@ -749,6 +749,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
}
YifuUser user = SecurityUtils.getUser();
Date preDispatchDate = DateUtil.formatDateByPatten(new Date(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
TEmployeeInsuranceWorkDayVo dayVo = null;
LocalTime currentTime = LocalTime.now();
R<TEmployeeInsuranceWorkDayVo> dataR;
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);
try {
dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
if (Common.isNotNull(dataR)
&& Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())) {
preDispatchDate = dataR.getData().getPriDisDate();
} else {
return R.failed("获取最近工作日失败!");
}
}catch (Exception e){
return R.failed("获取最近工作日异常:"+e.getMessage());
}
Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user,autoFlag);
//返回给前端的结果
List<InsuranceReplaceParam> listResult = map.get("listResult");
......@@ -828,6 +851,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//保费都默认是0
newDetail.setActualPremium(new BigDecimal("0.00"));
newDetail.setEstimatePremium(new BigDecimal("0.00"));
newDetail.setPreHandleTime(LocalDateUtil.parseLocalDate(DateUtil.formatDate(preDispatchDate)));
boolean insert = this.save(newDetail);
//替换记录
if (insert){
......@@ -2238,20 +2262,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (CollectionUtils.isNotEmpty(sourceIdCardList)) {
this.doFailInfo(sourceList, sourceIdCardList, replaceIdList, CommonConstants.THREE_STRING);
}
if (CollectionUtils.isNotEmpty(successList)) {
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask.updateEmpInfp(successList, CommonConstants.TWO_STRING);
//从successList中排查 successThree 的数据 这部分不同推送
if (Common.isNotNull(successThree)){
successList.removeAll(successThree);
}
//异步任务推送
doJointInsuranceTask.pushEstime(successList);
}
//操作记录
if (Common.isNotNull(successThree)){
successList.addAll(successThree);
}
if (CollectionUtils.isNotEmpty(successList)){
for (TInsuranceDetail detail : successList) {
//获取成功数据的remark
......@@ -2262,6 +2272,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
});
}
}
if (CollectionUtils.isNotEmpty(successList)) {
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask.updateEmpInfp(successList, CommonConstants.TWO_STRING);
//从successList中排查 successThree 的数据 这部分不同推送
if (Common.isNotNull(successThree)){
successList.removeAll(successThree);
}
//异步任务推送
doJointInsuranceTask.pushEstime(successList);
}
addOperate(operateList,user,InsurancesConstants.SUCCESSFUL);
addOperate(sourceList,user,InsurancesConstants.SOURCE_REPLACE,null,CommonConstants.ONE_INT);
return R.ok(errorList, InsurancesConstants.OPERATE_SUCCESS);
......
......@@ -731,6 +731,7 @@ public class DoJointInsuranceTask {
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType())) {
EkpInsurancesInfo info = insurancesInfoMapper.getEkpInsurancesInfoYg(param.getDetailId()+
CommonConstants.DOWN_LINE_STRING + (null == param.getDefaultSettleId() ? "" :param.getDefaultSettleId()));
if (Common.isNotNull(info)) {
//特殊处理下是否见费出单 是否全部结算为是
if ("0".equals(param.getIsJfcd())) {
//见费出单 是否全部结算 都是 是
......@@ -738,7 +739,6 @@ public class DoJointInsuranceTask {
//实际结算月份置空
info.setFd_3af9d11088facc(null);
}
if (Common.isNotNull(info)) {
initValueUpdate(info, deptInfoVo, param);
}
}
......@@ -792,7 +792,7 @@ public class DoJointInsuranceTask {
//实际保费
info.setFd_3adfe6610c0d2c(null != param.getActualPremium() ? param.getActualPremium().doubleValue() : null);
//应收
info.setFd_3adfe6e30f2a3c("是".equals(param.getBpoFlag()) ? 0 : BigDecimalUtils.safeSubtract(false,param.getActualPremium(),param.getEstimatePremium()).doubleValue());
info.setFd_3adfe6e30f2a3c("是".equals(param.getBpoFlag()) ? 0 : BigDecimalUtils.subtractAllowNegative(param.getActualPremium(),param.getEstimatePremium()).doubleValue());
//应支
info.setFd_3adfe6e3911ffe(param.getActualPremium().doubleValue());
if ("0".equals(param.getIsJfcd())){
......
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