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

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

@@ -708,7 +708,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
 			if (Common.isNotNull(field) && Common.isNotNull(attr)){
 				if (Common.isNotNull(attr.dataType())) {
 					nameDicMap.put(field.getName(), attr.dataType());
-				} else if (Common.isNotNull(attr.isArea())) {
+				} else if (Common.isNotNull(attr.isArea()) && attr.isArea()) {
 					nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL);
 				}
 			}

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

@@ -217,7 +217,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			baseMapper.deleteById(main);
 			main = null;
 		}
+		// 审核通过并且有在项，取在项
+		boolean empFirst = false;
 		if (main != null) {
+			if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				empFirst = true;
+			}
 			// 2024-7-3 17:23:50 倩倩要求放开状态拦截，前端加按钮禁用即可
 			/* (CommonConstants.ONE_STRING.equals(main.getStatus())
 					|| CommonConstants.TWO_STRING.equals(main.getStatus()))
@@ -231,8 +236,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				empId = tPreEmployeeInfo.getId();
 
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
 					empId = employee.getId();
+					tPreEmployeeInfo = new TPreEmployeeInfo();
 					BeanUtil.copyProperties(employee, tPreEmployeeInfo, ID);
 					tPreEmployeeInfo.setOldId(employee.getId());
 				}
@@ -243,7 +249,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			} else {
 				tPreEmployeeInfo = new TPreEmployeeInfo();
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
 					empId = employee.getId();
 					BeanUtil.copyProperties(employee, tPreEmployeeInfo, ID);
 					tPreEmployeeInfo.setOldId(employee.getId());
@@ -261,7 +267,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			// 预入职-项目档案表
 			if (tPreEmployeeProject != null) {
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
+					tPreEmployeeProject = new TPreEmployeeProject();
 					BeanUtil.copyProperties(project, tPreEmployeeProject, ID);
 					tPreEmployeeProject.setOldId(project.getId());
 				}
@@ -274,7 +281,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmployeeProject.setEmpIdcard(main.getEmpIdcard());
 				tPreEmployeeProject.setEmpName(main.getEmpName());
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
 					BeanUtil.copyProperties(project, tPreEmployeeProject, ID);
 					tPreEmployeeProject.setOldId(project.getId());
 				}
@@ -410,12 +417,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 		}
 		// 预入职-员工不良记录表
 		TPreEmpBadRecord tPreEmpBadRecord = tPreEmpBadRecordService.getTPreEmpBadRecordList(id);
-		if (tPreEmpBadRecord == null) {
+		if (tPreEmpBadRecord == null || empFirst) {
+			String preId = null;
+			if (tPreEmpBadRecord != null) {
+				preId = tPreEmpBadRecord.getId();
+			}
 			tPreEmpBadRecord = new TPreEmpBadRecord();
+			tPreEmpBadRecord.setId(preId);
 			if (Common.isNotNull(empId)) {
 				TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId);
 				if (info != null) {
 					BeanUtil.copyProperties(info, tPreEmpBadRecord, ID);
+					if (Common.isEmpty(preId)) {
+						tPreEmpBadRecord.setId(info.getId());
+					}
 					tPreEmpBadRecord.setEmpId(empId);
 					tPreEmpBadRecord.setOldId(info.getId());
 				}
@@ -428,17 +443,27 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			tPreEmpBadRecord.setCreateBy(user.getId());
 			tPreEmpBadRecord.setCreateName(user.getNickname());
 			tPreEmpBadRecord.setCreateTime(LocalDateTime.now());
-			tPreEmpBadRecordService.save(tPreEmpBadRecord);
+			if (Common.isEmpty(preId)) {
+				tPreEmpBadRecordService.save(tPreEmpBadRecord);
+			}
 		}
 		vo.setTpreEmpBadRecord(tPreEmpBadRecord);
 		// 预入职-紧急联络人
 		TPreEmpContactInfo tPreEmpContactInfo = tPreEmpContactInfoService.getTPreEmpContactInfoList(id);
-		if (tPreEmpContactInfo == null) {
+		if (tPreEmpContactInfo == null || empFirst) {
+			String preId = null;
+			if (tPreEmpContactInfo != null) {
+				preId = tPreEmpContactInfo.getId();
+			}
 			tPreEmpContactInfo = new TPreEmpContactInfo();
+			tPreEmpContactInfo.setId(preId);
 			if (Common.isNotNull(empId)) {
 				TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId);
 				if (info != null) {
 					BeanUtil.copyProperties(info, tPreEmpContactInfo, ID);
+					if (Common.isEmpty(preId)) {
+						tPreEmpContactInfo.setId(info.getId());
+					}
 					tPreEmpContactInfo.setEmpId(empId);
 					tPreEmpContactInfo.setOldId(info.getId());
 				}
@@ -447,17 +472,27 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			tPreEmpContactInfo.setCreateBy(user.getId());
 			tPreEmpContactInfo.setCreateName(user.getNickname());
 			tPreEmpContactInfo.setCreateTime(LocalDateTime.now());
-			tPreEmpContactInfoService.save(tPreEmpContactInfo);
+			if (Common.isEmpty(preId)) {
+				tPreEmpContactInfoService.save(tPreEmpContactInfo);
+			}
 		}
 		vo.setTpreEmpContactInfo(tPreEmpContactInfo);
 		// 预入职-员工伤残信息表
 		TPreEmpDisabilityInfo tPreEmpDisabilityInfo = tPreEmpDisabilityInfoService.getTPreEmpDisabilityInfoList(id);
-		if (tPreEmpDisabilityInfo == null) {
+		if (tPreEmpDisabilityInfo == null || empFirst) {
+			String preId = null;
+			if (tPreEmpDisabilityInfo != null) {
+				preId = tPreEmpDisabilityInfo.getId();
+			}
 			tPreEmpDisabilityInfo = new TPreEmpDisabilityInfo();
+			tPreEmpDisabilityInfo.setId(preId);
 			if (Common.isNotNull(empId)) {
 				TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId);
 				if (info != null) {
 					BeanUtil.copyProperties(info, tPreEmpDisabilityInfo, ID);
+					if (Common.isEmpty(preId)) {
+						tPreEmpDisabilityInfo.setId(info.getId());
+					}
 					tPreEmpDisabilityInfo.setEmpId(empId);
 					tPreEmpDisabilityInfo.setOldId(info.getId());
 				}
@@ -473,17 +508,27 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			tPreEmpDisabilityInfo.setCreateBy(user.getId());
 			tPreEmpDisabilityInfo.setCreateName(user.getNickname());
 			tPreEmpDisabilityInfo.setCreateTime(LocalDateTime.now());
-			tPreEmpDisabilityInfoService.save(tPreEmpDisabilityInfo);
+			if (Common.isEmpty(preId)) {
+				tPreEmpDisabilityInfoService.save(tPreEmpDisabilityInfo);
+			}
 		}
 		vo.setTpreEmpDisabilityInfo(tPreEmpDisabilityInfo);
 		// 预入职-员工学历信息表
 		TPreEmpEducation tPreEmpEducation = tPreEmpEducationService.getTPreEmpEducationList(id);
-		if (tPreEmpEducation == null) {
+		if (tPreEmpEducation == null || empFirst) {
+			String preId = null;
+			if (tPreEmpEducation != null) {
+				preId = tPreEmpEducation.getId();
+			}
 			tPreEmpEducation = new TPreEmpEducation();
+			tPreEmpEducation.setId(preId);
 			if (Common.isNotNull(empId)) {
 				TEmpEducation info = tEmpEducationService.getByEmpId(empId);
 				if (info != null) {
 					BeanUtil.copyProperties(info, tPreEmpEducation, ID);
+					if (Common.isEmpty(preId)) {
+						tPreEmpEducation.setId(info.getId());
+					}
 					tPreEmpEducation.setEmpId(empId);
 					tPreEmpEducation.setOldId(info.getId());
 
@@ -510,7 +555,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			tPreEmpEducation.setCreateBy(user.getId());
 			tPreEmpEducation.setCreateName(user.getNickname());
 			tPreEmpEducation.setCreateTime(LocalDateTime.now());
-			tPreEmpEducationService.save(tPreEmpEducation);
+			if (Common.isEmpty(preId)) {
+				tPreEmpEducationService.save(tPreEmpEducation);
+			}
 		} else {
 			// 附件
 			List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(tPreEmpEducation.getId());
@@ -571,6 +618,49 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmpFamilyService.save(record);
 				tPreEmpFamilyList.add(record);
 			}
+		} else if (empFirst) {
+			tPreEmpFamilyList = new ArrayList<>();
+			if (Common.isNotNull(empId)) {
+				List<TEmpFamily> infoList = tEmpFamilyService.getListByEmpId(empId);
+				if (infoList != null && !infoList.isEmpty()) {
+					TPreEmpFamily record;
+					for (TEmpFamily info : infoList) {
+						record = new TPreEmpFamily();
+						BeanUtil.copyProperties(info, record);
+						record.setEmpId(empId);
+						record.setOldId(info.getId());
+						record.setSettleDomain(deptId);
+						if (employee != null) {
+							record.setEmpId(employee.getId());
+							record.setEmpName(employee.getEmpName());
+							record.setEmpCode(employee.getEmpCode());
+						}
+						record.setEmpIdcard(empIdCard);
+						record.setPreMainId(id);
+						if (Common.isEmpty(record.getCreateBy())) {
+							record.setCreateBy(user.getId());
+							record.setCreateName(user.getNickname());
+							record.setCreateTime(LocalDateTime.now());
+						}
+						tPreEmpFamilyList.add(record);
+					}
+				}
+			}
+			if (tPreEmpFamilyList.isEmpty()) {
+				TPreEmpFamily record = new TPreEmpFamily();
+				record.setSettleDomain(deptId);
+				if (employee != null) {
+					record.setEmpId(employee.getId());
+					record.setEmpName(employee.getEmpName());
+					record.setEmpCode(employee.getEmpCode());
+				}
+				record.setEmpIdcard(empIdCard);
+				record.setPreMainId(id);
+				record.setCreateBy(user.getId());
+				record.setCreateName(user.getNickname());
+				record.setCreateTime(LocalDateTime.now());
+				tPreEmpFamilyList.add(record);
+			}
 		}
 		vo.setTpreEmpFamilyList(tPreEmpFamilyList);
 		// 预入职-人员档案表
@@ -580,7 +670,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			if (tPreEmployeeInfo == null) {
 				tPreEmployeeInfo = new TPreEmployeeInfo();
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
 					BeanUtil.copyProperties(employee, tPreEmployeeInfo, ID);
 					tPreEmployeeInfo.setOldId(project.getId());
 				}
@@ -609,7 +699,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			if (tPreEmployeeProject == null) {
 				tPreEmployeeProject = new TPreEmployeeProject();
 				// 预入职已审核+在项，取在项信息
-				if (CommonConstants.FOUR_STRING.equals(main.getStatus()) && employee != null && project != null) {
+				if (empFirst) {
 					BeanUtil.copyProperties(project, tPreEmployeeProject, ID);
 					tPreEmployeeProject.setOldId(project.getId());
 				}
@@ -631,6 +721,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			}
 			vo.setTpreEmployeeProject(tPreEmployeeProject);
 		}
+
 		// 预入职-员工职业资格信息表
 		List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalService.getTPreEmpProfessionalQualificationList(id);
 		if (tPreEmpProfessionalQualificationList == null || tPreEmpProfessionalQualificationList.isEmpty()) {
@@ -690,6 +781,62 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmpProfessionalService.save(record);
 				tPreEmpProfessionalQualificationList.add(record);
 			}
+		} else if (empFirst) {
+			tPreEmpProfessionalQualificationList = new ArrayList<>();
+			if (Common.isNotNull(empId)) {
+				List<TEmpProfessionalQualification> infoList = tEmpProfessionalService.getListByEmpId(empId);
+				TPreEmpProfessionalQualification record;
+				if (infoList != null && !infoList.isEmpty()) {
+					for (TEmpProfessionalQualification info : infoList) {
+						record = new TPreEmpProfessionalQualification();
+						BeanUtil.copyProperties(info, record);
+						record.setEmpId(empId);
+						record.setOldId(info.getId());
+						record.setSettleDomain(deptId);
+						if (employee != null) {
+							record.setEmpId(employee.getId());
+							record.setEmpName(employee.getEmpName());
+							record.setEmpCode(employee.getEmpCode());
+						}
+
+						// 附件
+						List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(info.getId());
+						if (attaInfoList != null) {
+							URL url;
+							for (TAttaInfo atta : attaInfoList) {
+								url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
+								atta.setAttaUrl(String.valueOf(url));
+							}
+						}
+						record.setAttaList(attaInfoList);
+						record.setPreMainId(id);
+						record.setEmpIdcard(empIdCard);
+						if (Common.isEmpty(record.getCreateBy())) {
+							record.setCreateBy(user.getId());
+							record.setCreateName(user.getNickname());
+							record.setCreateTime(LocalDateTime.now());
+						}
+						tPreEmpProfessionalQualificationList.add(record);
+					}
+				}
+			}
+			if (tPreEmpProfessionalQualificationList.isEmpty()) {
+				TPreEmpProfessionalQualification record = new TPreEmpProfessionalQualification();
+				record.setSettleDomain(deptId);
+				if (employee != null) {
+					record.setEmpId(employee.getId());
+					record.setEmpName(employee.getEmpName());
+					record.setEmpCode(employee.getEmpCode());
+				}
+				record.setEmpIdcard(empIdCard);
+				record.setPreMainId(id);
+				record.setAttaList(new ArrayList<>());
+				record.setCreateBy(user.getId());
+				record.setCreateName(user.getNickname());
+				record.setCreateTime(LocalDateTime.now());
+				tPreEmpProfessionalQualificationList.add(record);
+			}
+
 		} else {
 			for (TPreEmpProfessionalQualification info : tPreEmpProfessionalQualificationList) {
 				// 附件
@@ -749,6 +896,45 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmpOtherFileService.save(record);
 				tPreEmpOtherFileList.add(record);
 			}
+		} else if (empFirst) {
+			tPreEmpOtherFileList = new ArrayList<>();
+			if (Common.isNotNull(empId)) {
+				List<TEmpOtherFile> infoList = tEmpOtherFileService.getListByEmpId(empId);
+				TPreEmpOtherFile record;
+				if (infoList != null && !infoList.isEmpty()) {
+					for (TEmpOtherFile info : infoList) {
+						record = new TPreEmpOtherFile();
+						BeanUtil.copyProperties(info, record);
+						record.setEmpId(empId);
+						record.setOldId(info.getId());
+						// 附件
+						List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(info.getId());
+						if (attaInfoList != null) {
+							URL url;
+							for (TAttaInfo atta : attaInfoList) {
+								url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
+								atta.setAttaUrl(String.valueOf(url));
+							}
+						}
+						record.setAttaList(attaInfoList);
+						record.setPreMainId(id);
+						if (Common.isEmpty(record.getCreateTime())) {
+							record.setCreateTime(LocalDateTime.now());
+						}
+						tPreEmpOtherFileList.add(record);
+					}
+				}
+			}
+			if (tPreEmpOtherFileList.isEmpty()) {
+				TPreEmpOtherFile record = new TPreEmpOtherFile();
+				if (employee != null) {
+					record.setEmpId(employee.getId());
+				}
+				record.setCreateTime(LocalDateTime.now());
+				record.setPreMainId(id);
+				record.setAttaList(new ArrayList<>());
+				tPreEmpOtherFileList.add(record);
+			}
 		} else {
 			for (TPreEmpOtherFile info : tPreEmpOtherFileList) {
 				// 附件
@@ -811,12 +997,55 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmpWorkRecordingService.save(record);
 				tPreEmpWorkRecordingList.add(record);
 			}
+		} else if (empFirst) {
+			tPreEmpWorkRecordingList = new ArrayList<>();
+			if (Common.isNotNull(empId)) {
+				List<TEmpWorkRecording> infoList = tEmpWorkRecordingService.getListByEmpId(empId);
+				TPreEmpWorkRecording record;
+				if (infoList != null && !infoList.isEmpty()) {
+					for (TEmpWorkRecording info : infoList) {
+						record = new TPreEmpWorkRecording();
+						BeanUtil.copyProperties(info, record);
+						record.setEmpId(empId);
+						record.setOldId(info.getId());
+						record.setSettleDomain(deptId);
+						if (employee != null) {
+							record.setEmpId(employee.getId());
+							record.setEmpName(employee.getEmpName());
+							record.setEmpCode(employee.getEmpCode());
+						}
+						record.setEmpIdcard(empIdCard);
+						record.setPreMainId(id);
+						if (Common.isEmpty(record.getCreateBy())) {
+							record.setCreateBy(user.getId());
+							record.setCreateName(user.getNickname());
+							record.setCreateTime(LocalDateTime.now());
+						}
+						tPreEmpWorkRecordingList.add(record);
+					}
+				}
+			}
+			if (tPreEmpWorkRecordingList.isEmpty()) {
+				TPreEmpWorkRecording record = new TPreEmpWorkRecording();
+				record.setSettleDomain(deptId);
+				if (employee != null) {
+					record.setEmpId(employee.getId());
+					record.setEmpName(employee.getEmpName());
+					record.setEmpCode(employee.getEmpCode());
+				}
+				record.setEmpIdcard(empIdCard);
+				record.setPreMainId(id);
+				record.setCreateBy(user.getId());
+				record.setCreateName(user.getNickname());
+				record.setCreateTime(LocalDateTime.now());
+				tPreEmpWorkRecordingList.add(record);
+			}
 		}
 		vo.setTpreEmpWorkRecordingList(tPreEmpWorkRecordingList);
 
 		// 预入职-附件 9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
 		List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id);
-		if ((attaInfoList == null || attaInfoList.isEmpty()) && Common.isNotNull(empId)) {
+		if ((attaInfoList == null || attaInfoList.isEmpty() || empFirst) && Common.isNotNull(empId)) {
 			attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(empId);
 		}
 		if (attaInfoList != null && !attaInfoList.isEmpty()) {
@@ -1573,6 +1802,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			if (Common.isEmpty(tPreEmployeeInfo.getTaxMonth()) && !isMustUpdateSalary) {
 				taxMonth = DateUtil.getThisMonth();
 			}
+			if (Common.isEmpty(tPreEmployeeInfo.getBankNo())) {
+				taxMonth = null;
+			}
 			newEmp.setTaxMonth(taxMonth);
 			newEmp.setBankName(tPreEmployeeInfo.getBankName());
 			newEmp.setBankSubName(tPreEmployeeInfo.getBankSubName());
@@ -2625,9 +2857,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 					oneTitle = "不良记录";
 					headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"}));
 
-					Set<String> titleContent = getExportFieldNameDetailByClass(TMainExportAllVO.class);
+					Set<String> titleContent = getExportFieldNameDetailByClass(TPreMainExportAllVO.class);
 					// 获取所有字典type
-					Map<String,String> nameAndDicTypeMap = getConverterDicTypeAndArea(TMainExportAllVO.class);
+					Map<String,String> nameAndDicTypeMap = getConverterDicTypeAndArea(TPreMainExportAllVO.class);
 					// 获取所有字典对应的值
 					Map<String,String> redisLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.REDIS_DICT_LABLE);
 					Map<String,String> idLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE_ALL);
@@ -2835,7 +3067,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			if (Common.isNotNull(field) && Common.isNotNull(attr)){
 				if (Common.isNotNull(attr.dataType())) {
 					nameDicMap.put(field.getName(), attr.dataType());
-				} else if (Common.isNotNull(attr.isArea())) {
+				} else if (Common.isNotNull(attr.isArea()) && attr.isArea()) {
 					nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL);
 				}
 			}