Commit 68194b46 authored by hongguangwu's avatar hongguangwu

MVP1.7.8-状态

parent 7638cff7
...@@ -1967,6 +1967,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1967,6 +1967,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp.setCreateBy(user.getId()); emp.setCreateBy(user.getId());
emp.setCreateName(user.getNickname()); emp.setCreateName(user.getNickname());
emp.setCreateTime(LocalDateTime.now()); emp.setCreateTime(LocalDateTime.now());
emp.setFileProvince(tPreEmployeeInfo.getFileProvince());
emp.setFileCity(tPreEmployeeInfo.getFileCity());
emp.setFileTown(tPreEmployeeInfo.getFileTown());
} else { } else {
BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID); BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID);
} }
...@@ -1992,7 +1997,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1992,7 +1997,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
// String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"} // String[ ignoreProperties new Strin{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息 // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"}; String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
...@@ -2427,7 +2432,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2427,7 +2432,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
//String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"} //String] ignoreProperties = new String]"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息 // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"}; String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
......
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