Commit 858c3a71 authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 0402419e
...@@ -93,6 +93,13 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> { ...@@ -93,6 +93,13 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor); int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
// 导出详情使用 hgw 2024-6-26 11:05:41 // 导出详情使用 hgw 2024-6-26 11:05:41
List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor); List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByContract(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByEducation(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByBad(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByDisability(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByFamily(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListByProfessional(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
// 导出详情使用 hgw 2024-6-26 11:05:41 // 导出详情使用 hgw 2024-6-26 11:05:41
int getTEmpMainAllCountOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor); int getTEmpMainAllCountOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
......
...@@ -2984,14 +2984,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2984,14 +2984,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(detail.getEmpPhone())) { if (Common.isNotNull(detail.getEmpPhone())) {
mobileList.add(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(); StringBuilder errorInfo = new StringBuilder();
if (errorMust.length() > 0) { if (errorMust.length() > 0) {
...@@ -3001,7 +2993,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3001,7 +2993,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
errorInfo.append("格式不正确:").append(errorFormat); errorInfo.append("格式不正确:").append(errorFormat);
} }
detail.setErrorInfo(errorInfo.toString()); detail.setErrorInfo(errorInfo.toString());
if (curVo != null) { if (curVo != null || Common.isNotNull(errorInfo)) {
detail.setIsMain(false); detail.setIsMain(false);
} else { } else {
detail.setIsMain(true); detail.setIsMain(true);
......
...@@ -78,7 +78,7 @@ public class DiyExcelImportUtil implements Serializable { ...@@ -78,7 +78,7 @@ public class DiyExcelImportUtil implements Serializable {
// 极限空白表头列,超过阈值,将不继续循环列 // 极限空白表头列,超过阈值,将不继续循环列
int maxTitleNullColumNum = 1; int maxTitleNullColumNum = 1;
// 极限空白身份证,超过将不循环行 // 极限空白身份证,超过将不循环行
int maxIdCardNullRow = 1; int maxIdCardNullRow = 2;
int idCardNullNum; int idCardNullNum;
Cell cell; Cell cell;
// 循环每个sheet // 循环每个sheet
......
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