Commit 43674d38 authored by fangxinjiang's avatar fangxinjiang

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

parents cbaabea1 004f6202
......@@ -52,10 +52,10 @@ public class TEmployeePreLogDetail extends BaseEntity {
/**
* 类型:1档案;2商险
*/
@ExcelAttribute(name = "类型:1档案;2商险", maxLength = 1)
@Length(max = 1, message = "类型:1档案;2商险不能超过1个字符")
@ExcelProperty("类型:1档案;2商险")
@Schema(description = "类型:1档案;2商险")
@ExcelAttribute(name = "类型:1档案;2商险3合同", maxLength = 1)
@Length(max = 1, message = "类型:1档案;2商险3合同不能超过1个字符")
@ExcelProperty("类型:1档案;2商险3合同")
@Schema(description = "类型:1档案;2商险 3合同")
private String type;
/**
* 入职确认信息表ID
......
......@@ -217,8 +217,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
List<TEmployeePreLogDetail> detailList = new ArrayList<>();
// 档案信息修改
TEmployeePreLogDetail detailEmpLog = null;
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)) {
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)
&& !"employeeContractPre".equals(differenceKey)) {
differenceKey = differenceKey.replace("insurancePreList","");
differenceKey = differenceKey.replace("employeeContractPre","");
diffTitle = "档案信息";
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.TWO_STRING);
......@@ -236,7 +238,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
boolean isModifyInsurance = false;
TEmployeeInsurancePre oldInsurance;
String differenceInsuranceKey;
String differenceContractKey;
TEmployeePreLogDetail detailInsuranceLog;
for (TEmployeeInsurancePre newInsurance : newList) {
differenceInsuranceKey = null;
......@@ -292,13 +293,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
saveOrUpdateList.add(newInsurance);
}
}
boolean isModifyContract =false;
if (contractOld != null && newInfo.getEmployeeContractPre() != null) {
differenceContractKey = HrEquator.comparisonValueIgnoreField(contractOld, newInfo.getEmployeeContractPre(), CONTRACT_IGNORE_FIELD);
if (null != differenceContractKey) {
isModifyContract = true;
}
}
// 如果变更了
if (isModifyInsurance) {
if (Common.isNotNull(diffTitle)) {
......@@ -307,13 +301,30 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
diffTitle = "商险信息";
}
}
if (isModifyContract) {
if (Common.isNotNull(diffTitle)) {
diffTitle += "、合同信息";
} else {
diffTitle = "合同信息";
}
}
boolean isModifyContract =false;
String differenceContractKey = "";
if (contractOld != null && newInfo.getEmployeeContractPre() != null) {
TEmployeeContractPre employeeContractPre = newInfo.getEmployeeContractPre();
//1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null);
employeeContractPre.setAttaList(null);
differenceContractKey = HrEquator.comparisonValueIgnoreField(contractOld, employeeContractPre, CONTRACT_IGNORE_FIELD);
if (differenceContractKey.length() > 0) {
isModifyContract = true;
}
}
if (isModifyContract) {
if (Common.isNotNull(diffTitle)) {
diffTitle += "、合同信息";
} else {
diffTitle = "合同信息";
}
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.TWO_STRING);
detailEmpLog.setType(CommonConstants.THREE_STRING);
this.setLogBaseInfo(empPreId, contractOld, newInfo.getEmployeeContractPre(), user, differenceContractKey, logId, detailEmpLog);
detailList.add(detailEmpLog);
}
// 有修改,则加日志
if (Common.isNotNull(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