Commit 9ee51044 authored by hongguangwu's avatar hongguangwu

MVP1.7.1 优化

parent 9b28a970
...@@ -1846,7 +1846,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1846,7 +1846,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
isNew = true; isNew = true;
project = new TEmployeeProject(); project = new TEmployeeProject();
} }
String[] ignoreProperties = new String[]{"id", "status"};
if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) { if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) {
tPreEmployeeProject.setWorkingHours(""); tPreEmployeeProject.setWorkingHours("");
} }
...@@ -1857,7 +1856,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1857,7 +1856,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 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"}; , "enjoinDate", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (Common.isEmpty(project.getStatus())) { if (Common.isEmpty(project.getStatus())) {
...@@ -2465,12 +2464,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2465,12 +2464,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8)); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
if (count > 200000) { 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万条,请联系管理员后端导出预入职"); exportError(response, "数据超过20万条,请联系管理员后端导出预入职");
} else { } else {
exportLimit.setDeleteFlag(CommonConstants.ZERO_INT); exportLimit.setDeleteFlag(CommonConstants.ZERO_INT);
......
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