MVP1.7.1 优化

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -1846,7 +1846,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				isNew = true;
 				project = new TEmployeeProject();
 			}
-			String[] ignoreProperties = new String[]{"id", "status"};
 			if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) {
 				tPreEmployeeProject.setWorkingHours("");
 			}
@@ -1857,7 +1856,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmployeeProject.setTryPeriod("");
 			}
 			// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
-			ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate"
+			String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate"
 					, "enjoinDate", "tryPeriod"};
 			BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
 			if (Common.isEmpty(project.getStatus())) {
@@ -2465,12 +2464,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
 				ExcelWriter excelWriter = null;
 				if (count > 200000) {
-				//if (count > CommonConstants.EXCEL_EXPORT_LIMIT)
-					/*List<List<String>> strList = new ArrayList<>();
-					strList.add(this.getNewArrayList(new String[]{"数据超过20万条，请联系管理员后端导出！！"}));
-					List<List<String>> headList = Lists.newArrayList();
-					headList.add(this.getNewArrayList(new String[]{"提示"}));
-					EasyExcelFactory.write(out).head(headList).sheet("数据超限").doWrite(strList);*/
 					exportError(response, "数据超过20万条，请联系管理员后端导出预入职");
 				} else {
 					exportLimit.setDeleteFlag(CommonConstants.ZERO_INT);