Commit 3acc35dd authored by huyuchen's avatar huyuchen

申报修改

parent d7fcaa90
...@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+ CommonConstants.DOWN_LINE_STRING + CommonConstants.DOWN_LINE_STRING
+ infoVo.getProvidentCreateMonth().trim() + infoVo.getProvidentCreateMonth().trim()
+ CommonConstants.DOWN_LINE_STRING + CommonConstants.DOWN_LINE_STRING
+ Math.round(BigDecimalUtils.safeAdd(infoVo.getProvidentSum()).doubleValue() * 100) / 100.0); + Math.round(BigDecimalUtils.safeAdd(infoVo.getUnitProvidentSum()).doubleValue() * 100) / 100.0);
} }
//存在公积金缴费数据 //存在公积金缴费数据
if (null != paymentInfo && ((BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) != 0) if (null != paymentInfo && BigDecimalUtils.isNullToZero(paymentInfo.getUnitProvidentSum()).compareTo(BigDecimal.ZERO) != 0) {
|| ((BigDecimalUtils.isNullToZero(paymentInfo.getSocialSum()).compareTo(BigDecimal.ZERO) == 0)
&& BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) == 0))) {
//允许覆盖,但已核准表或工资结算或已锁定不允许覆盖 //允许覆盖,但已核准表或工资结算或已锁定不允许覆盖
errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" +
......
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