Commit 15ba61b5 authored by fangxinjiang's avatar fangxinjiang

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

parents c0c26429 87c09dfc
......@@ -275,6 +275,12 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
exportLimit.setCreateBy(user.getId());
exportLimit.setType(CommonConstants.TWO_INT);
List<TArchivesExportLimit> limitList = tArchivesExportLimitMapper.getLimitList(exportLimit);
boolean myExport = false;
for (TArchivesExportLimit limit1 : limitList) {
if (limit1.getCreateBy().equals(user.getId())) {
myExport = true;
}
}
String name = "档案完整度监控详情";
String fileName = name + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表
......@@ -293,12 +299,18 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("数据超限").doWrite(strList);
} else if (myExport) {
List<List<String>> strList = new ArrayList<>();
strList.add(this.getNewArrayList(new String[]{"您正在导出,请耐心等待10分钟后再导出!"}));
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("您正在导出完整度").doWrite(strList);
} else if (limitList != null && limitList.size() > 2) {
List<List<String>> strList = new ArrayList<>();
strList.add(this.getNewArrayList(new String[]{"多人正在导出,请耐心等待10分钟后再导出!"}));
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("多人正在导出").doWrite(strList);
EasyExcelFactory.write(out).head(headList).sheet("多人正在导出完整度").doWrite(strList);
} else {
exportLimit.setDeleteFlag(CommonConstants.ZERO_INT);
exportLimit.setCreateName(user.getNickname());
......
......@@ -2398,6 +2398,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
exportLimit.setCreateBy(user.getId());
exportLimit.setType(CommonConstants.ONE_INT);
List<TArchivesExportLimit> limitList = tArchivesExportLimitMapper.getLimitList(exportLimit);
boolean myExport = false;
for (TArchivesExportLimit limit1 : limitList) {
if (limit1.getCreateBy().equals(user.getId())) {
myExport = true;
}
}
String name = "预入职导出全量";
String fileName = name + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表
......@@ -2416,12 +2422,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("数据超限").doWrite(strList);
} else if (myExport) {
List<List<String>> strList = new ArrayList<>();
strList.add(this.getNewArrayList(new String[]{"您正在导出,请耐心等待10分钟后再导出!"}));
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("您正在导出预入职").doWrite(strList);
} else if (limitList != null && limitList.size() > 2) {
List<List<String>> strList = new ArrayList<>();
strList.add(this.getNewArrayList(new String[]{"多人正在导出,请耐心等待10分钟后再导出!"}));
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("多人正在导出").doWrite(strList);
EasyExcelFactory.write(out).head(headList).sheet("多人正在导出预入职").doWrite(strList);
} else {
exportLimit.setDeleteFlag(CommonConstants.ZERO_INT);
exportLimit.setCreateName(user.getNickname());
......@@ -2984,6 +2996,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(detail.getEmpPhone())) {
mobileList.add(detail.getEmpPhone());
}
// 手机号码(紧急联系人)
if (Common.isNotNull(detail.getTel())) {
mobileList.add(detail.getTel());
}
// 手机号码(家庭成员)
if (Common.isNotNull(detail.getContractTel())) {
mobileList.add(detail.getContractTel());
}
}
StringBuilder errorInfo = new StringBuilder();
if (errorMust.length() > 0) {
......@@ -2993,7 +3013,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
errorInfo.append("格式不正确:").append(errorFormat);
}
detail.setErrorInfo(errorInfo.toString());
if (curVo != null || Common.isNotNull(errorInfo)) {
if (curVo != null || errorInfo.length()>0) {
detail.setIsMain(false);
} else {
detail.setIsMain(true);
......
......@@ -201,6 +201,7 @@ public class DiyExcelImportUtil implements Serializable {
if (Common.isEmpty(idCardValue)) {
idCardNullNum++;
} else {
idCardNullNum = 0;
contentList.add(contentMap);
}
/*if (Common.isNotNull(idCardValue) && (regIdCard(idCardValue)
......
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