Commit 14017989 authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 3cc1ff82
......@@ -921,6 +921,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
oldPreEmployee.setTaxMonth(taxMonth);
oldPreEmployee.setTaxMonthFlag(CommonConstants.ZERO_STRING);
}
if (Common.isNotNull(preMain.getSourType()) && CommonConstants.ONE_STRING.equals(preMain.getSourType())
&& !oldPreEmployee.getTaxMonth().equals(tPreEmployee.getTaxMonth())) {
return R.failed("计税月份和薪酬查询处的计税月份不一致!请填写:" + oldPreEmployee.getTaxMonth());
}
if (Common.isNotNull(tPreEmployee.getTaxMonthFlag()) && CommonConstants.ZERO_STRING.equals(oldPreEmployee.getTaxMonthFlag())
&& !oldPreEmployee.getTaxMonth().equals(tPreEmployee.getTaxMonth())) {
return R.failed("本年度有发薪纪录,计税月份不可编辑!");
......
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