MVP1.6.6-社保士兵派单id优化

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

@@ -329,7 +329,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				tPreEmpEducation.setEmpCode(employee.getEmpCode());
 			}
 			tPreEmpEducation.setEmpIdcard(empIdCard);
+			tPreEmpEducation.setAttaList(new ArrayList<>());
 			tPreEmpEducationService.save(tPreEmpEducation);
+		} else {
+			// 附件
+			List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(tPreEmpEducation.getId());
+			if (attaInfoList != null) {
+				URL url;
+				for (TAttaInfo atta : attaInfoList) {
+					url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
+					atta.setAttaUrl(String.valueOf(url));
+				}
+			}
+			tPreEmpEducation.setAttaList(attaInfoList);
 		}
 		vo.setTPreEmpEducation(tPreEmpEducation);
 		// 预入职-员工家庭信息表
@@ -428,9 +440,23 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				}
 				record.setEmpIdcard(empIdCard);
 				record.setPreMainId(id);
+				record.setAttaList(new ArrayList<>());
 				tPreEmpProfessionalQualificationService.save(record);
 				tPreEmpProfessionalQualificationList.add(record);
 			}
+		} else {
+			for (TPreEmpProfessionalQualification info : tPreEmpProfessionalQualificationList) {
+				// 附件
+				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));
+					}
+				}
+				info.setAttaList(attaInfoList);
+			}
 		}
 		vo.setTPreEmpProfessionalQualificationList(tPreEmpProfessionalQualificationList);
 		// 预入职-员工工作履历信息表