Commit 1e6d4c65 authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

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