MVP1.6.6-预入职相关_校验

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

@@ -1813,10 +1813,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 					list = baseMapper.getTPreEmpMainAllList(searchVo);
 					if (Common.isNotNull(list)) {
 						ExcelWriterSheetBuilder writeSheet = EasyExcelFactory.writerSheet(name + index);
-						if (list.size() > 1 && list.size() < 10000) {
-							// 合并重复行
-							this.getHeBingHang(list, writeSheet);
-						}
 						excelWriter.write(list, writeSheet.build());
 						index++;
 					}

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml

@@ -299,9 +299,11 @@
 			,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
 			,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39
 			,if(ee.HIGH_IDENTIFICATION=0,'是','否') field40	,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
+
 			,if(e.FIRST_WORK_FLAG=0,'是','否') field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
 			,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
 			,if(e.HAVE_QUALIFICATION=0,'是','否') field51,ep.DECLARE_YEAR field52,qualification_type.label field53
+
 			,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55	,ed.OCCUPATIONAL_DISEASE field56
 			,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57	,ed.INFECTIOUS_NAME field58	,if(ed.DISABILITY_FLAG=0,'是','否') field59
 			,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63
@@ -324,10 +326,35 @@
 		left join t_pre_emp_contact_info ec on a.id=ec.PRE_MAIN_ID
 		left join t_pre_emp_education ee on a.id=ee.PRE_MAIN_ID
 		left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
-		left join t_pre_emp_work_recording ew on a.id=ew.PRE_MAIN_ID
-		left join t_pre_emp_family ef on a.id=ef.PRE_MAIN_ID
-		left join t_pre_emp_professional_qualification ep on a.id=ep.PRE_MAIN_ID
-		left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
+		left join (
+		select
+		SUBSTRING_INDEX(GROUP_CONCAT(ee.PRE_MAIN_ID ORDER BY ee.create_time desc),',',1) PRE_MAIN_ID
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.WORK_UNIT ORDER BY ee.create_time desc),',',1) WORK_UNIT
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.WORK_JOB ORDER BY ee.create_time desc),',',1) WORK_JOB
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.START_DATE ORDER BY ee.create_time desc),',',1) START_DATE
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.END_DATE ORDER BY ee.create_time desc),',',1) END_DATE
+		from t_pre_emp_work_recording ee
+		GROUP BY ee.PRE_MAIN_ID
+		) ew on e.id=ew.PRE_MAIN_ID
+		left join (
+		select
+		SUBSTRING_INDEX(GROUP_CONCAT(ee.PRE_MAIN_ID ORDER BY ee.create_time desc),',',1) PRE_MAIN_ID
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.FAMILY_NAME ORDER BY ee.create_time desc),',',1) FAMILY_NAME
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.RELATIONSHIP_SELF ORDER BY ee.create_time desc),',',1) RELATIONSHIP_SELF
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.CONTRACT_TEL ORDER BY ee.create_time desc),',',1) CONTRACT_TEL
+		from t_pre_emp_family ee
+		GROUP BY ee.PRE_MAIN_ID
+		) ef on e.id=ef.PRE_MAIN_ID
+		left join (
+		select
+		SUBSTRING_INDEX(GROUP_CONCAT(ee.PRE_MAIN_ID ORDER BY ee.create_time desc),',',1) PRE_MAIN_ID
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.DECLARE_YEAR ORDER BY ee.create_time desc),',',1) DECLARE_YEAR
+		,SUBSTRING_INDEX(GROUP_CONCAT(ee.QUALIFICATION_TYPE ORDER BY ee.create_time desc),',',1) QUALIFICATION_TYPE
+		from t_pre_emp_professional_qualification ee
+		GROUP BY ee.PRE_MAIN_ID
+		) ep on e.id=ep.PRE_MAIN_ID
+
+		    left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
 		left join t_pre_emp_disability_info ed on a.id=ed.PRE_MAIN_ID
 		left join t_pre_emp_bad_record eb on a.id=eb.PRE_MAIN_ID
 		<where>