Commit 5693b5f3 authored by fangxinjiang's avatar fangxinjiang

日志优化-fxj

parent 27a8d8a8
...@@ -178,6 +178,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -178,6 +178,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD.add("contractUpdateFlag"); IGNORE_FIELD.add("contractUpdateFlag");
IGNORE_FIELD.add("isLeave"); IGNORE_FIELD.add("isLeave");
IGNORE_FIELD.add("isRefuse"); IGNORE_FIELD.add("isRefuse");
IGNORE_FIELD.add("configId");
} }
private static final List<String> PRE_IGNORE_FIELD = new ArrayList<>(); private static final List<String> PRE_IGNORE_FIELD = new ArrayList<>();
...@@ -193,6 +194,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -193,6 +194,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
PRE_IGNORE_FIELD.add("contractUpdateFlag"); PRE_IGNORE_FIELD.add("contractUpdateFlag");
PRE_IGNORE_FIELD.add("isLeave"); PRE_IGNORE_FIELD.add("isLeave");
PRE_IGNORE_FIELD.add("isRefuse"); PRE_IGNORE_FIELD.add("isRefuse");
PRE_IGNORE_FIELD.add("configId");
} }
private static final List<String> CONTRACT_IGNORE_FIELD = new ArrayList<>(); private static final List<String> CONTRACT_IGNORE_FIELD = new ArrayList<>();
...@@ -221,6 +224,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -221,6 +224,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
CONTRACT_IGNORE_FIELD.add("fundUpdateFlag"); CONTRACT_IGNORE_FIELD.add("fundUpdateFlag");
CONTRACT_IGNORE_FIELD.add("isLeave"); CONTRACT_IGNORE_FIELD.add("isLeave");
CONTRACT_IGNORE_FIELD.add("isRefuse"); CONTRACT_IGNORE_FIELD.add("isRefuse");
CONTRACT_IGNORE_FIELD.add("configId");
} }
private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>(); private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
...@@ -257,6 +261,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -257,6 +261,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
SOCIAL_IGNORE_FIELD.add("processStatus"); SOCIAL_IGNORE_FIELD.add("processStatus");
SOCIAL_IGNORE_FIELD.add("isLeave"); SOCIAL_IGNORE_FIELD.add("isLeave");
SOCIAL_IGNORE_FIELD.add("isRefuse"); SOCIAL_IGNORE_FIELD.add("isRefuse");
SOCIAL_IGNORE_FIELD.add("configId");
} }
private static final List<String> SOCIAL_IGNORE_FIELD_TWO = new ArrayList<>(); private static final List<String> SOCIAL_IGNORE_FIELD_TWO = new ArrayList<>();
...@@ -292,6 +297,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -292,6 +297,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
SOCIAL_IGNORE_FIELD_TWO.add("fundUpdateFlag"); SOCIAL_IGNORE_FIELD_TWO.add("fundUpdateFlag");
SOCIAL_IGNORE_FIELD_TWO.add("isLeave"); SOCIAL_IGNORE_FIELD_TWO.add("isLeave");
SOCIAL_IGNORE_FIELD_TWO.add("isRefuse"); SOCIAL_IGNORE_FIELD_TWO.add("isRefuse");
SOCIAL_IGNORE_FIELD_TWO.add("configId");
} }
......
...@@ -155,6 +155,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -155,6 +155,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
SOCIAL_IGNORE_FIELD.add("lowerLimit"); SOCIAL_IGNORE_FIELD.add("lowerLimit");
SOCIAL_IGNORE_FIELD.add("fundUpdateFlag"); SOCIAL_IGNORE_FIELD.add("fundUpdateFlag");
SOCIAL_IGNORE_FIELD.add("processStatus"); SOCIAL_IGNORE_FIELD.add("processStatus");
SOCIAL_IGNORE_FIELD.add("isLeave");
SOCIAL_IGNORE_FIELD.add("isRefuse");
SOCIAL_IGNORE_FIELD.add("configId");
} }
// 档案信息比较时忽略的字段 // 档案信息比较时忽略的字段
...@@ -169,6 +172,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -169,6 +172,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
PRE_IGNORE_FIELD.add("fundUpdateFlag"); PRE_IGNORE_FIELD.add("fundUpdateFlag");
PRE_IGNORE_FIELD.add("socialUpdateFlag"); PRE_IGNORE_FIELD.add("socialUpdateFlag");
PRE_IGNORE_FIELD.add("contractUpdateFlag"); PRE_IGNORE_FIELD.add("contractUpdateFlag");
PRE_IGNORE_FIELD.add("isLeave");
PRE_IGNORE_FIELD.add("isRefuse");
PRE_IGNORE_FIELD.add("configId");
} }
// 合同信息比较时忽略的字段 // 合同信息比较时忽略的字段
...@@ -196,6 +202,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -196,6 +202,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
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"); CONTRACT_IGNORE_FIELD.add("fundUpdateFlag");
CONTRACT_IGNORE_FIELD.add("isLeave");
CONTRACT_IGNORE_FIELD.add("isRefuse");
CONTRACT_IGNORE_FIELD.add("configId");
} }
// 商险明细比较时忽略的字段 // 商险明细比较时忽略的字段
...@@ -221,6 +230,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -221,6 +230,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
INSURANCE_IGNORE_FIELD.add("fundUpdateFlag"); INSURANCE_IGNORE_FIELD.add("fundUpdateFlag");
INSURANCE_IGNORE_FIELD.add("socialUpdateFlag"); INSURANCE_IGNORE_FIELD.add("socialUpdateFlag");
INSURANCE_IGNORE_FIELD.add("contractUpdateFlag"); INSURANCE_IGNORE_FIELD.add("contractUpdateFlag");
INSURANCE_IGNORE_FIELD.add("isLeave");
INSURANCE_IGNORE_FIELD.add("isRefuse");
INSURANCE_IGNORE_FIELD.add("configId");
} }
/** /**
......
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