Commit 6fd32ae9 authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第五次提交

parent 562b3f03
...@@ -214,7 +214,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -214,7 +214,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
} }
} }
// 1. 校验表格中一个姓名、身份证只能有一条 // 1. 校验表格中一个姓名、身份证只能有一条
String uniqueKey = data.getEmpIdcard() + "_" + data.getEmpName() + "_" + data.getDeptNo(); String uniqueKey = data.getEmpIdcard() + "_" + data.getEmpName();
if (null != map.get(uniqueKey)) { if (null != map.get(uniqueKey)) {
ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex() ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex()
,"第" + data.getRowIndex() + "行:姓名和身份证信息存在重复数据",data); ,"第" + data.getRowIndex() + "行:姓名和身份证信息存在重复数据",data);
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_electronic_archive_detail a FROM t_electronic_archive_detail a
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0' and a.STATUS = '1'
<include refid="tElectronicArchiveDetail_where"/> <include refid="tElectronicArchiveDetail_where"/>
</where> </where>
ORDER BY a.CREATE_TIME DESC ORDER BY a.CREATE_TIME DESC
......
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