Commit b7afad31 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent d980b0dd
...@@ -737,19 +737,39 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -737,19 +737,39 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} else if (oldInfo.getServerItem().contains("社保") } else if (oldInfo.getServerItem().contains("社保")
&& newInfo.getServerItem().contains("社保") && newInfo.getServerItem().contains("社保")
&& null != newInfo.getSocialUpdateFlag() && null != newInfo.getSocialUpdateFlag()
&& newInfo.getSocialUpdateFlag() && dispatchInfoPreOldVo == null && dispatchInfoPreVo != null) { && newInfo.getSocialUpdateFlag()) {
if (Common.isNotNull(diffTitle)) { // 是转否
if (!diffTitle.contains("社保信息")){ if ( dispatchInfoPreOldVo == null && dispatchInfoPreVo != null){
diffTitle += "、社保信息"; if (Common.isNotNull(diffTitle)) {
if (!diffTitle.contains("社保信息")){
diffTitle += "、社保信息";
}
} else {
diffTitle = "社保信息";
} }
} else { detailEmpLog = new TEmployeePreLogDetail();
diffTitle = "社保信息"; detailEmpLog.setModelType(CommonConstants.ONE_STRING);
detailEmpLog.setType(CommonConstants.FOUR_STRING);
this.setLogBaseInfo(empPreId, null, dispatchInfoPreVo, user, null, logId, detailEmpLog);
detailList.add(detailEmpLog);
} }
detailEmpLog = new TEmployeePreLogDetail(); // 否转是
detailEmpLog.setModelType(CommonConstants.ONE_STRING); if ( dispatchInfoPreOldVo != null && dispatchInfoPreVo == null){
detailEmpLog.setType(CommonConstants.FOUR_STRING); if (Common.isNotNull(diffTitle)) {
this.setLogBaseInfo(empPreId, null, dispatchInfoPreVo, user, null, logId, detailEmpLog); if (!diffTitle.contains("社保信息")){
detailList.add(detailEmpLog); diffTitle += "、社保信息";
}
} else {
diffTitle = "社保信息";
}
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.THREE_STRING);
detailEmpLog.setType(CommonConstants.FOUR_STRING);
this.setLogBaseInfo(empPreId, dispatchInfoPreOldVo, null, user, null
, logId, detailEmpLog);
detailList.add(detailEmpLog);
}
} }
// 公积金处理逻辑 // 公积金处理逻辑
...@@ -863,20 +883,37 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -863,20 +883,37 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} else if (oldInfo.getServerItem().contains("公积金") } else if (oldInfo.getServerItem().contains("公积金")
&& newInfo.getServerItem().contains("公积金") && newInfo.getServerItem().contains("公积金")
&& null != newInfo.getFundUpdateFlag() && null != newInfo.getFundUpdateFlag()
&& newInfo.getFundUpdateFlag() && dispatchInfoFundPreOldVo == null && newInfo.getFundUpdateFlag()) {
&& dispatchInfoFundPreVo != null) { if (dispatchInfoFundPreOldVo == null && dispatchInfoFundPreVo != null){
if (Common.isNotNull(diffTitle)) { if (Common.isNotNull(diffTitle)) {
if (!diffTitle.contains("公积金信息")){ if (!diffTitle.contains("公积金信息")){
diffTitle += "、公积金信息"; diffTitle += "、公积金信息";
}
} else {
diffTitle = "公积金信息";
} }
} else { detailEmpLog = new TEmployeePreLogDetail();
diffTitle = "公积金信息"; detailEmpLog.setModelType(CommonConstants.ONE_STRING);
detailEmpLog.setType(CommonConstants.FIVE_STRING);
this.setLogBaseInfo(empPreId, null, dispatchInfoFundPreVo, user, null, logId, detailEmpLog);
detailList.add(detailEmpLog);
}
// 否转是
if (dispatchInfoFundPreOldVo != null && dispatchInfoFundPreVo == null){
if (Common.isNotNull(diffTitle)) {
if (!diffTitle.contains("公积金信息")){
diffTitle += "、公积金信息";
}
} else {
diffTitle = "公积金信息";
}
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.THREE_STRING);
detailEmpLog.setType(CommonConstants.FIVE_STRING);
this.setLogBaseInfo(empPreId, dispatchInfoFundPreOldVo, null, user, null
, logId, detailEmpLog);
detailList.add(detailEmpLog);
} }
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.ONE_STRING);
detailEmpLog.setType(CommonConstants.FIVE_STRING);
this.setLogBaseInfo(empPreId, null, dispatchInfoFundPreVo, user, null, logId, detailEmpLog);
detailList.add(detailEmpLog);
} }
// 有修改,则加日志 // 有修改,则加日志
......
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