Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -319,6 +319,24 @@ public class TEmployeeProject extends BaseEntity {
 	@TableField(exist = false)
 	private Integer fileTown;
 
+	/**
+	 * 社保-省
+	 */
+	@Schema(description = "社保-省")
+	private Integer socialProvince;
+
+	/**
+	 * 社保-市
+	 */
+	@Schema(description = "社保-市")
+	private Integer socialCity;
+
+	/**
+	 * 社保-县
+	 */
+	@Schema(description = "社保-县")
+	private Integer socialTown;
+
 	/**
 	 * 员工合同状态（字典）
 	 */

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

@@ -96,13 +96,12 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			updateTEmployeeProject.setUnitName(tEmpChangeInfo.getNewDept());
 			tEmployeeProjectService.updateById(updateTEmployeeProject);
 			tEmpChangeInfo.setProId(updateTEmployeeProject.getId());
+			// 记录变更日志
+			TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(updateTEmployeeProject.getId());
+			tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), tEmployeeProjectOld, updateTEmployeeProject);
 		}
 		//保存档案划转记录
 		this.save(tEmpChangeInfo);
-
-		// 记录变更日志
-		TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(tEmpChangeInfo.getProId());
-		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), tEmployeeProjectOld, updateTEmployeeProject);
 		return R.ok();
 	}
 
@@ -154,7 +153,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			//待划转员工已在目标结算主体下不可划转
 			TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
 					.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,excel.getNewSettleCode())
-					.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
+					.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL)
+					.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT));
 			if (Common.isNotNull(tEmployeeProject)) {
 				errorMsg.add(MsgUtils.getMessage(ErrorCodes.CHECKS_CHANGE_EMP_PROJECT, excel.getNewSettleCode()));
 			}
@@ -165,7 +165,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 						.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,excel.getOldSettleCode())
 						.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
 				if (Common.isNotNull(updateTEmployeePro)) {
-					if (CommonConstants.ONE_STRING.equals(updateTEmployeePro.getProjectStatus())) {
+					if (CommonConstants.ONE_INT == updateTEmployeePro.getProjectStatus()) {
 						errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_DELETE_EXIT, excel.getOldSettleCode()));
 					} else if (Common.isNotNull(tSettleDomain)) {
 						updateTEmployeePro.setDeptNo(tSettleDomain.getDepartNo());

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

@@ -73,9 +73,12 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
 	@Override
 	public void importTmpDisability(List<EmpDisabilityExcelVO> excelVOList, List<ErrorMessage> errorMessageList) {
 		// 个性化校验逻辑
-		List<TEmpDisabilityInfo> list = this.list(Wrappers.<TEmpDisabilityInfo>query().lambda()
-				.in(TEmpDisabilityInfo::getEmpIdcard,excelVOList.stream().map(EmpDisabilityExcelVO::getEmpIdcard).collect(Collectors.toList()))
-				.eq(TEmpDisabilityInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
+		List<TEmpDisabilityInfo> list = null;
+		if (Common.isNotNull(excelVOList)){
+			this.list(Wrappers.<TEmpDisabilityInfo>query().lambda()
+					.in(TEmpDisabilityInfo::getEmpIdcard,excelVOList.stream().map(EmpDisabilityExcelVO::getEmpIdcard).collect(Collectors.toList()))
+					.eq(TEmpDisabilityInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
+		}
 		TEmployeeInfo emp;
 		TEmpDisabilityInfo  exist;
 		ErrorMessage errorMsg;
@@ -114,12 +117,14 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
 		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
-		// 检查添加是否已经存在
-		boolean match = list.stream().anyMatch(info -> excel.getDisabilityName().equals(info.getDisabilityName())
-				&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
+		if (Common.isNotNull(list)){
+			// 检查添加是否已经存在
+			boolean match = list.stream().anyMatch(info -> excel.getDisabilityName().equals(info.getDisabilityName())
+					&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
 
-		if (match) {
-			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_DISABILITY_NAME_EXISTING));
+			if (match) {
+				return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_DISABILITY_NAME_EXISTING));
+			}
 		}
 		return null;
 	}

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

@@ -76,9 +76,12 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
 	@Override
 	public void importEmpEducation(List<EmpEducationExcelVO> excelVOList, List<ErrorMessage> errorMessageList) {
 		/// 个性化校验逻辑
-		List<TEmpEducation> list = this.list(Wrappers.<TEmpEducation>query().lambda()
-				.in(TEmpEducation::getEmpIdcard,excelVOList.stream().map(EmpEducationExcelVO::getEmpIdcard).collect(Collectors.toList()))
-				.eq(TEmpEducation::getDeleteFlag,CommonConstants.ZERO_STRING));
+		List<TEmpEducation> list = null;
+		if (Common.isNotNull(excelVOList)){
+			this.list(Wrappers.<TEmpEducation>query().lambda()
+					.in(TEmpEducation::getEmpIdcard,excelVOList.stream().map(EmpEducationExcelVO::getEmpIdcard).collect(Collectors.toList()))
+					.eq(TEmpEducation::getDeleteFlag,CommonConstants.ZERO_STRING));
+		}
 		TEmployeeInfo emp;
 		TEmpEducation  exist;
 		ErrorMessage errorMsg;
@@ -218,12 +221,14 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
 				&& CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
-		// 检查添加是否已经存在
-		boolean match = list.stream().anyMatch(info -> excel.getEducationName().equals(info.getEducationName())
-				&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
+		if (Common.isNotNull(list)){
+			// 检查添加是否已经存在
+			boolean match = list.stream().anyMatch(info -> excel.getEducationName().equals(info.getEducationName())
+					&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
 
-		if (match) {
-			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_EDUCATION_EXISTING));
+			if (match) {
+				return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_EDUCATION_EXISTING));
+			}
 		}
 		return null;
 	}

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

@@ -75,9 +75,12 @@ public class TEmpFamilyServiceImpl extends ServiceImpl<TEmpFamilyMapper, TEmpFam
 	@Override
 	public void importEmpFamily(List<EmpFamilyExcelVO> excelVOList,List<ErrorMessage> errorMessageList) {
 		// 个性化校验逻辑
-		List<TEmpFamily> list = this.list(Wrappers.<TEmpFamily>query().lambda()
-				.in(TEmpFamily::getEmpIdcard,excelVOList.stream().map(EmpFamilyExcelVO::getEmpIdcard).collect(Collectors.toList()))
-				.eq(TEmpFamily::getDeleteFlag,CommonConstants.ZERO_STRING));
+		List<TEmpFamily> list = null;
+		if (Common.isNotNull(excelVOList)){
+			this.list(Wrappers.<TEmpFamily>query().lambda()
+					.in(TEmpFamily::getEmpIdcard,excelVOList.stream().map(EmpFamilyExcelVO::getEmpIdcard).collect(Collectors.toList()))
+					.eq(TEmpFamily::getDeleteFlag,CommonConstants.ZERO_STRING));
+		}
 		TEmployeeInfo emp;
 		TEmpFamily  exist;
 		ErrorMessage errorMsg;
@@ -118,12 +121,14 @@ public class TEmpFamilyServiceImpl extends ServiceImpl<TEmpFamilyMapper, TEmpFam
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 
 		}
-		// 检查添加是否已经存在
-		boolean match = list.stream().anyMatch(info -> excel.getFamilyName().equals(info.getFamilyName())
-				&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
+		if (Common.isNotNull(list)){
+			// 检查添加是否已经存在
+			boolean match = list.stream().anyMatch(info -> excel.getFamilyName().equals(info.getFamilyName())
+					&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
 
-		if (match) {
-			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_FAMILY_NAME_EXISTING));
+			if (match) {
+				return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_FAMILY_NAME_EXISTING));
+			}
 		}
 		return null;
 	}

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

@@ -94,9 +94,12 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
 
 	@Override
 	public void importEmpCertificate(List<EmpCertificateExcelVO> excelVOList, List<ErrorMessage> errorMessageList) {
-		List<TEmpProfessionalQualification> list = this.list(Wrappers.<TEmpProfessionalQualification>query().lambda()
-				.in(TEmpProfessionalQualification::getEmpIdcard,excelVOList.stream().map(EmpCertificateExcelVO::getEmpIdcard).collect(Collectors.toList()))
-				.eq(TEmpProfessionalQualification::getDeleteFlag,CommonConstants.ZERO_STRING));
+		List<TEmpProfessionalQualification> list = null;
+		if (Common.isNotNull(excelVOList)){
+			list = this.list(Wrappers.<TEmpProfessionalQualification>query().lambda()
+					.in(TEmpProfessionalQualification::getEmpIdcard,excelVOList.stream().map(EmpCertificateExcelVO::getEmpIdcard).collect(Collectors.toList()))
+					.eq(TEmpProfessionalQualification::getDeleteFlag,CommonConstants.ZERO_STRING));
+		}
 		TEmployeeInfo emp;
 		TEmpProfessionalQualification  exist;
 		ErrorMessage errorMsg;
@@ -119,6 +122,7 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
 				continue;
 			}
 			excel.setEmpName(emp.getEmpName());
+			excel.setEmpIdcard(emp.getEmpIdcard());
 			exist = baseMapper.selectOne(Wrappers.<TEmpProfessionalQualification>query().lambda()
 					.eq(TEmpProfessionalQualification::getEmpIdcard,excel.getEmpIdcard())
 					.eq(TEmpProfessionalQualification::getQualificationLevel,excel.getQualificationLevel())
@@ -152,14 +156,16 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
 		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
-		// 检查添加是否已经存在
-		boolean match = list.stream().anyMatch(info -> excel.getQualificationLevel()
-				.equals(info.getQualificationLevel())
-				&& excel.getEmpIdcard().equals(info.getEmpIdcard())
-				&& excel.getQualificationType().equals(info.getQualificationType()));
+		if (Common.isNotNull(list)){
+			// 检查添加是否已经存在
+			boolean match = list.stream().anyMatch(info -> excel.getQualificationLevel()
+					.equals(info.getQualificationLevel())
+					&& excel.getEmpIdcard().equals(info.getEmpIdcard())
+					&& excel.getQualificationType().equals(info.getQualificationType()));
 
-		if (match) {
-			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_CERTIFICATE_NAME_EXISTING));
+			if (match) {
+				return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_CERTIFICATE_NAME_EXISTING));
+			}
 		}
 		return null;
 	}

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

@@ -68,9 +68,12 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
 	@Override
 	public void importEmpWorkRecord(List<EmpWorkRecordExcelVO> excelVOList, List<ErrorMessage> errorMessageList) {
 		// 个性化校验逻辑
-		List<TEmpWorkRecording> list = this.list(Wrappers.<TEmpWorkRecording>query().lambda()
-				.in(TEmpWorkRecording::getEmpIdcard,excelVOList.stream().map(EmpWorkRecordExcelVO::getEmpIdcard).collect(Collectors.toList()))
-				.eq(TEmpWorkRecording::getDeleteFlag,CommonConstants.ZERO_STRING));
+		List<TEmpWorkRecording> list =null;
+		if (Common.isNotNull(excelVOList)){
+			this.list(Wrappers.<TEmpWorkRecording>query().lambda()
+					.in(TEmpWorkRecording::getEmpIdcard,excelVOList.stream().map(EmpWorkRecordExcelVO::getEmpIdcard).collect(Collectors.toList()))
+					.eq(TEmpWorkRecording::getDeleteFlag,CommonConstants.ZERO_STRING));
+		}
 		TEmployeeInfo emp;
 		TEmpWorkRecording  exist;
 		ErrorMessage errorMsg;
@@ -155,13 +158,15 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
 		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
-		// 检查添加是否已经存在
-		boolean match = list.stream().anyMatch(info -> excel.getWorkDepart().equals(info.getWorkDepart())
-				&& excel.getWorkUnit().equals(info.getWorkUnit())
-				&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
+		if (Common.isNotNull(list)){
+			// 检查添加是否已经存在
+			boolean match = list.stream().anyMatch(info -> excel.getWorkDepart().equals(info.getWorkDepart())
+					&& excel.getWorkUnit().equals(info.getWorkUnit())
+					&& excel.getEmpIdcard().equals(info.getEmpIdcard()));
 
-		if (match) {
-			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_WORK_RECORD_EXISTING));
+			if (match) {
+				return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_WORK_RECORD_EXISTING));
+			}
 		}
 		return null;
 	}

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

@@ -408,7 +408,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			if (updateProjectList.size() > CommonConstants.dingleDigitIntArray[0]) {
 				for (EmployeeProjectNewOldVO newOldVO : updateProjectList) {
 					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1]
-							,"", newOldVO.getNewProjectEmployee().getId()
+							, "", newOldVO.getNewProjectEmployee().getId()
 							, newOldVO.getOldProjectEmployee(), newOldVO.getNewProjectEmployee());
 				}
 			}
@@ -681,6 +681,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 		List<TEmployeeProject> updateList = new ArrayList<>();
 
+		List<TEmployeeInfo> updTEmployeeList = new ArrayList();
+
 		Map<String, Integer> checkCountMap = new HashMap<>();
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
@@ -702,12 +704,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					.eq(TEmployeeProject::getDeptNo, excel.getDeptNo())
 					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL));
 			if (Common.isEmpty(tEmployeeProject)) {
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_EXIT_ERROR)));
-			}
-
-			// 数据合法情况
-			if (CollUtil.isEmpty(errorMessageList)) {
-
+				if (tEmployeeProject.getProjectStatus() != CommonConstants.dingleDigitIntArray[0]) {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_DELETE_ERROR)));
+				} else {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_EXIT_ERROR)));
+				}
+			} else {
 				updateExcelProj(excel, updateList, tEmployeeProject);
 				if (Common.isNotNull(excel.getEmpNatrue())) {
 					if (!excel.getEmpNatrue().equals(tEmployeeProject.getEmpNatrue())) {
@@ -723,19 +725,28 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 							} else if (CommonConstants.ONE_STRING.equals(excel.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(empNature)) {
 								tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
 							}
-							tEmployeeInfoMapper.updateById(tEmployeeInfo);
+							updTEmployeeList.add(tEmployeeInfo);
 							tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeInfoCof, tEmployeeInfo);
 						}
 					}
 				}
 			}
 		}
-		try {
-			if (updateList.size() > CommonConstants.dingleDigitIntArray[0]) {
-				baseMapper.updateExcelEmpProject(updateList);
+
+		// 数据合法情况
+		if (CollUtil.isEmpty(errorMessageList)) {
+			try {
+				if (updateList.size() > CommonConstants.dingleDigitIntArray[0]) {
+					baseMapper.updateExcelEmpProject(updateList);
+				}
+				if (updTEmployeeList.size()> CommonConstants.dingleDigitIntArray[0]) {
+					for (TEmployeeInfo tEmployeeInfo : updTEmployeeList) {
+						tEmployeeInfoMapper.updateById(tEmployeeInfo);
+					}
+				}
+			} catch (Exception e) {
+				log.error("数据更新异常", e);
 			}
-		} catch (Exception e) {
-			log.error("数据更新异常", e);
 		}
 	}
 
@@ -845,17 +856,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		//获取记录
 		list = gettEmpProInfoExportVos(idstr, projectDTO);
 
-		if (Common.isNotNull(list)) {
-			ExcelUtil<EmployeeProjectExportVO> util = new ExcelUtil<>(EmployeeProjectExportVO.class);
-			for (EmployeeProjectExportVO vo : list) {
-				util.convertEntity(vo, null, null, null);
-			}
-		}
-
 		ServletOutputStream out = null;
 		try {
 			if (list.size() > 0) {
 				out = response.getOutputStream();
+				ExcelUtil<EmployeeProjectExportVO> util = new ExcelUtil<>(EmployeeProjectExportVO.class);
+				for (EmployeeProjectExportVO vo : list) {
+					util.convertEntity(vo, null, null, null);
+				}
 				response.setContentType("multipart/form-data");
 				response.setCharacterEncoding("utf-8");
 				response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));

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

@@ -47,6 +47,9 @@
     <result property="fileProvince" column="FILE_PROVINCE"/>
     <result property="fileCity" column="FILE_CITY"/>
     <result property="fileTown" column="FILE_TOWN"/>
+    <result property="socialProvince" column="SOCIAL_PROVINCE"/>
+    <result property="socialCity" column="SOCIAL_CITY"/>
+    <result property="socialTown" column="SOCIAL_TOWN"/>
     <result property="empPhone" column="EMP_PHONE"/>
     <result property="salaryStatus" column="SALARY_STATUS"/>
     <result property="insuranceStatus" column="INSURANCE_STATUS"/>
@@ -162,6 +165,9 @@
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
+				  a.SOCIAL_PROVINCE,
+				  a.SOCIAL_CITY,
+				  a.SOCIAL_TOWN,
 				  a.SALARY_STATUS
 	</sql>
 
@@ -198,6 +204,9 @@
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
+				  a.SOCIAL_PROVINCE,
+				  a.SOCIAL_CITY,
+				  a.SOCIAL_TOWN,
 				  a.SALARY_STATUS,
 				  b.VALIDITY_START,
 				  b.VALIDITY_END,
@@ -365,6 +374,15 @@
 			<if test="tEmployeeProject.fileTown != null">
 				AND b.FILE_TOWN = #{tEmployeeProject.fileTown}
 			</if>
+			<if test="tEmployeeProject.socialProvince != null">
+				AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
+			</if>
+			<if test="tEmployeeProject.fileCity != null">
+				AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
+			</if>
+			<if test="tEmployeeProject.fileTown != null">
+				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
+			</if>
 		</if>
 	</sql>
 
@@ -472,6 +490,15 @@
 			<if test="tEmployeeProject.fileTown != null">
 				AND b.FILE_TOWN = #{tEmployeeProject.fileTown}
 			</if>
+			<if test="tEmployeeProject.socialProvince != null">
+				AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
+			</if>
+			<if test="tEmployeeProject.fileCity != null">
+				AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
+			</if>
+			<if test="tEmployeeProject.fileTown != null">
+				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
+			</if>
 			<if test="tEmployeeProject.idList != null">
 				AND a.id in
 				<foreach item="idStr" index="index" collection="tEmployeeProject.idList" open="(" separator="," close=")">

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/config/AsyncConfig.java

+package com.yifu.cloud.plus.v1.yifu.common.core.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 异步线程池
+ * @Author fxj
+ * @Date 2021-05-20
+ * @return
+ **/
+@Configuration
+@EnableAsync
+@Slf4j
+public class AsyncConfig implements AsyncConfigurer {
+
+    // todo 幂等性如何保证
+    @Override
+    public Executor getAsyncExecutor() {
+        //定义线程池
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        /**
+         * <!-- 设置allowCoreThreadTimeout=true（默认false）时，核心线程会超时关闭 -->
+         */
+        taskExecutor.setAllowCoreThreadTimeOut(true);
+        /**
+         * 核心线程数
+         * 1）<!-- 线程池维护线程的最少数量，即使没有任务需要执行，也会一直存活 -->
+         * 2）<!-- 设置allowCoreThreadTimeout=true（默认false）时，核心线程会超时关闭 -->
+         */
+        taskExecutor.setCorePoolSize(2);
+        /**
+         * <!-- 允许的空闲时间，当线程空闲时间达到keepAliveTime时，线程会退出，直到线程数量=corePoolSize -->
+         * <!-- 如果allowCoreThreadTimeout=true，则会直到线程数量=0 -->
+         */
+        taskExecutor.setKeepAliveSeconds(200);
+        /**
+         * <!-- 线程池维护线程的最大数量 -->
+         * <!-- 当线程数>=corePoolSize，且任务队列已满时。线程池会创建新线程来处理任务 -->
+         * <!-- 当线程数=maxPoolSize，且任务队列已满时，线程池会拒绝处理任务而抛出异常，异常见下
+         */
+        taskExecutor.setMaxPoolSize(8);
+        /**
+         * <!-- 缓存队列（阻塞队列）当核心线程数达到最大时，新任务会放在队列中排队等待执行 -->
+         */
+        taskExecutor.setQueueCapacity(100);
+        /**
+         * 建议配置threadNamePrefix属性，出问题时可以更方便的进行排查。
+         **/
+        taskExecutor.setThreadNamePrefix("CRM_TO_HRO_EXECUTOR");
+        // 捕捉线程队列满的 拒绝处理
+        taskExecutor.setRejectedExecutionHandler((Runnable r, ThreadPoolExecutor exe) -> {
+            log.info("当前任务线程池队列已满.");
+        });
+        //初始化
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return null;
+    }
+}

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -225,7 +225,10 @@ public interface ErrorCodes {
 	 * 人员不在该项目，无法更新
 	 */
 	String CHECKS_EMP_EXIT_ERROR = "checks.emp.exit.error";
-
+	/**
+	 * 人员已减项，无法更新
+	 */
+	String CHECKS_EMP_DELETE_ERROR = "checks.emp.delete.error";
 	// 该人员已存在，禁止重复添加
 	String ARCHIVES_IMPORT_EMP_IDCARD_EXISTING = "archives.import.emp.idCard.existing";
 

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java

@@ -137,7 +137,7 @@ public class ExcelUtil <T> implements Serializable {
 						}
 					} else if (attr.isArea()){
 						//区域字段处理 TODO
-						value = getAreaLabel("area_"+field.get(vo));
+						value = getAreaLabel((String) field.get(vo));
 					}
 					field.set(vo, Common.isNotNull(value)?value:field.get(vo));
 				}catch (Exception e){
@@ -287,10 +287,10 @@ public class ExcelUtil <T> implements Serializable {
 					if (attr.isArea()) {
 						//区域字段处理 TODO
 						if (!Common.isNotNull(attr.parentField())) {
-							tempStr = getAreaValue("area_"+c.trim(), tempStr, attr,rowNum,errorTemp);
+							tempStr = getAreaValue(c.trim(), tempStr, attr,rowNum,errorTemp);
 						} else {
 							// TODO
-							tempStr = getAreaValue("area_"+c.trim()+ "_" + getFieldValueByName(attr.parentField(), data, DateUtil.ISO_EXPANDED_DATE_FORMAT), tempStr, attr,rowNum,errorTemp);
+							tempStr = getAreaValue(c.trim()+ "_" + getFieldValueByName(attr.parentField(), data, DateUtil.ISO_EXPANDED_DATE_FORMAT), tempStr, attr,rowNum,errorTemp);
 						}
 					}
 				}
@@ -449,11 +449,11 @@ public class ExcelUtil <T> implements Serializable {
 		return propertyValue;
 	}
 	private String getAreaLabel(String c) {
-		return (String)RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c);
+		return (String)RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + c);
 	}
 
 	private String getAreaValue(String c, String tempStr, ExcelAttribute attr,Integer rowNum, ErrorMessage errorTemp) {
-		tempStr =  String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + c));
+		tempStr =  String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c));
 		if (Common.isEmpty(tempStr)){
 			errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name() + "：" + c.trim() + "校验异常，请联系管理人员"), errorTemp);
 			return CommonConstants.EMPTY_STRING;

yifu-common/yifu-common-core/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.yifu.cloud.plus.v1.yifu.common.core.config.JacksonConfiguration,\
+  com.yifu.cloud.plus.v1.yifu.common.core.config.AsyncConfig,\
   com.yifu.cloud.plus.v1.yifu.common.core.config.RedisTemplateConfiguration,\
   com.yifu.cloud.plus.v1.yifu.common.core.config.RestTemplateConfiguration,\
   com.yifu.cloud.plus.v1.yifu.common.core.util.SpringContextHolder,\

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -61,6 +61,7 @@ checks.reduce.project.error=\u5B58\u5728\u5DF2\u51CF\u9879\u7684\u9879\u76EE\uFF
 checks.exit.empproject.error=\u8BE5\u4EBA\u5458\u6682\u65E0\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u5148\u81F3\u201C\u5728\u6863\u4EBA\u5458\u201D\u5904\u5EFA\u6863
 
 checks.emp.exit.error=\u4EBA\u5458\u4E0D\u5728\u8BE5\u9879\u76EE\uFF0C\u65E0\u6CD5\u66F4\u65B0
+checks.emp.delete.error=\u4EBA\u5458\u5DF2\u51CF\u9879\uFF0C\u65E0\u6CD5\u66F4\u65B0
 checks.project.delete.error=\u9879\u76EE\u6863\u6848\u72B6\u6001\u4E3A\u5DF2\u5BA1\u6838\uFF0C\u7981\u6B62\u5220\u9664
 
 archives.emp.certificate.name.existing=\u8BE5\u5458\u5DE5\u5DF2\u5B58\u5728\u5BF9\u5E94\u8D44\u683C\u7C7B\u578B\u548C\u8D44\u683C\u7B49\u7EA7\u7684\u8BC1\u4E66

yifu-common/yifu-common-security/src/main/java/com/yifu.cloud.plus.v1/yifu/common/security/exception/GlobalExceptionHandler.java

@@ -53,7 +53,7 @@ public class GlobalExceptionHandler {
      * @ExceptionHandler:当这个Controller中任何一个方法发生异常，一定会被这个方法拦截到
 	 */
 	@ExceptionHandler(Exception.class)
-	//@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+	@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
 	@ResponseBody
 	public R exception(Exception e) {
 		errorLog( e );