Commit dc0af853 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 324dda67
...@@ -173,6 +173,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -173,6 +173,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD.add("createName"); IGNORE_FIELD.add("createName");
IGNORE_FIELD.add("updateBy"); IGNORE_FIELD.add("updateBy");
IGNORE_FIELD.add("isAddress"); IGNORE_FIELD.add("isAddress");
IGNORE_FIELD.add("fundUpdateFlag");
} }
private static final List<String> PRE_IGNORE_FIELD = new ArrayList<>(); private static final List<String> PRE_IGNORE_FIELD = new ArrayList<>();
...@@ -183,6 +184,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -183,6 +184,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
PRE_IGNORE_FIELD.add("createBy"); PRE_IGNORE_FIELD.add("createBy");
PRE_IGNORE_FIELD.add("createName"); PRE_IGNORE_FIELD.add("createName");
PRE_IGNORE_FIELD.add("updateBy"); PRE_IGNORE_FIELD.add("updateBy");
PRE_IGNORE_FIELD.add("fundUpdateFlag");
} }
private static final List<String> CONTRACT_IGNORE_FIELD = new ArrayList<>(); private static final List<String> CONTRACT_IGNORE_FIELD = new ArrayList<>();
...@@ -208,6 +210,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -208,6 +210,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
CONTRACT_IGNORE_FIELD.add("timeoutElecSign"); CONTRACT_IGNORE_FIELD.add("timeoutElecSign");
CONTRACT_IGNORE_FIELD.add("internshipPeriodNum"); CONTRACT_IGNORE_FIELD.add("internshipPeriodNum");
CONTRACT_IGNORE_FIELD.add("tryPeriodNum"); CONTRACT_IGNORE_FIELD.add("tryPeriodNum");
CONTRACT_IGNORE_FIELD.add("fundUpdateFlag");
} }
private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>(); private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
...@@ -278,7 +281,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -278,7 +281,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldInfo.setFundIsBuy(newInfo.getFundIsBuy()); oldInfo.setFundIsBuy(newInfo.getFundIsBuy());
//比较差异 //比较差异
String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo); String differenceKey = HrEquator.comparisonValueIgnoreField(oldInfo, newInfo, PRE_IGNORE_FIELD);
//如果有差异保存差异 //如果有差异保存差异
List<TEmployeeInsurancePre> newList = newInfo.getInsurancePreList(); List<TEmployeeInsurancePre> newList = newInfo.getInsurancePreList();
String diffTitle = null; String diffTitle = null;
......
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