Commit 7b41b49d authored by fangxinjiang's avatar fangxinjiang

是否BPO结算模式字段同步-fxj

parent bfe5d0ec
...@@ -227,6 +227,11 @@ public class InsurancesConstants { ...@@ -227,6 +227,11 @@ public class InsurancesConstants {
* 商险减员中,无法退回 * 商险减员中,无法退回
*/ */
public static final String REDUCE_ROLLBACK_REDUCE_IS_NOT_ALLOW = "商险减员中,无法退回"; public static final String REDUCE_ROLLBACK_REDUCE_IS_NOT_ALLOW = "商险减员中,无法退回";
/**
* 实缴数据支出中或已支出,若要退回,请撤回支出结算后尝试!
*/
public static final String REDUCE_ROLLBACK_PAY_IS_NOT_ALLOW = "实缴数据支出中或已支出,若要退回,请撤回支出结算后尝试!";
/** /**
* 员工姓名不能为空 * 员工姓名不能为空
*/ */
......
...@@ -1730,6 +1730,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1730,6 +1730,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
sourceIdCardList.add(detail.getEmpIdcardNo()); sourceIdCardList.add(detail.getEmpIdcardNo());
replaceIdList.add(detail.getId()); replaceIdList.add(detail.getId());
} }
//判断是否已支出或支出中
EkpSettleStatusVo vo = ekpSettleService.getSettleStatusFromEkpInsuranceDetail(detail.getId());
if (vo != null && (vo.getPayStatus().equals("已结算")
|| vo.getPayStatus().equals("结算中"))) {
InsuranceListVO listVO = new InsuranceListVO();
BeanCopyUtils.copyProperties(detail,listVO);
listVO.setProjectName(detail.getDeptName());
listVO.setErrorMessage(InsurancesConstants.REDUCE_ROLLBACK_PAY_IS_NOT_ALLOW);
}
} }
//批量更新商险和替换表 //批量更新商险和替换表
if (!updList.isEmpty()) { if (!updList.isEmpty()) {
......
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