Commit adad285e authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 56c4c846 dc0af853
......@@ -173,6 +173,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD.add("createName");
IGNORE_FIELD.add("updateBy");
IGNORE_FIELD.add("isAddress");
IGNORE_FIELD.add("fundUpdateFlag");
}
private static final List<String> PRE_IGNORE_FIELD = new ArrayList<>();
......@@ -183,6 +184,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
PRE_IGNORE_FIELD.add("createBy");
PRE_IGNORE_FIELD.add("createName");
PRE_IGNORE_FIELD.add("updateBy");
PRE_IGNORE_FIELD.add("fundUpdateFlag");
}
private static final List<String> CONTRACT_IGNORE_FIELD = new ArrayList<>();
......@@ -208,6 +210,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
CONTRACT_IGNORE_FIELD.add("timeoutElecSign");
CONTRACT_IGNORE_FIELD.add("internshipPeriodNum");
CONTRACT_IGNORE_FIELD.add("tryPeriodNum");
CONTRACT_IGNORE_FIELD.add("fundUpdateFlag");
}
private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
......@@ -278,7 +281,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldInfo.setFundIsBuy(newInfo.getFundIsBuy());
//比较差异
String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo);
String differenceKey = HrEquator.comparisonValueIgnoreField(oldInfo, newInfo, PRE_IGNORE_FIELD);
//如果有差异保存差异
List<TEmployeeInsurancePre> newList = newInfo.getInsurancePreList();
String diffTitle = null;
......@@ -579,6 +582,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundTime(dispatchInfoFundPreVo);
differenceFundKey = HrEquator.comparisonValueIgnoreField(dispatchInfoFundPreOldVo
, dispatchInfoFundPreVo, SOCIAL_IGNORE_FIELD);
//如果为不修改直接清空差异
if (null != newInfo.getFundUpdateFlag()
&& !newInfo.getFundUpdateFlag().booleanValue()){
differenceFundKey ="";
}
if (differenceFundKey.length() > 0) {
if (Common.isNotNull(diffTitle)) {
diffTitle += "、公积金信息";
......
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