MVP1.6.6-预入职相关_保存审核等

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

@@ -1078,6 +1078,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				}
 			}
 			BeanUtil.copyProperties(tPreEmpEducation, tEmpEducation, ID);
+			if (Common.isEmpty(tEmpEducation.getEmpCode())) {
+				tEmpEducation.setEmpCode(emp.getEmpCode());
+			}
+			if (Common.isEmpty(tEmpEducation.getCreateBy())) {
+				tEmpEducation.setCreateBy(user.getId());
+			}
+			if (Common.isEmpty(tEmpEducation.getCreateTime())) {
+				tEmpEducation.setCreateTime(LocalDateTime.now());
+			}
 			tEmpEducation.setDeleteFlag(CommonConstants.STATUS_NORMAL);
 			tEmpEducation.setEmpId(empId);
 			if (Common.isNotNull(empIdCard)) {
@@ -1143,6 +1152,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			BeanUtil.copyProperties(tPreEmpDisabilityInfo, tEmpDisabilityInfo, ID);
 			tEmpDisabilityInfo.setDeleteFlag(CommonConstants.STATUS_NORMAL);
 			tEmpDisabilityInfo.setEmpId(empId);
+			if (Common.isEmpty(tEmpDisabilityInfo.getEmpCode())) {
+				tEmpDisabilityInfo.setEmpCode(emp.getEmpCode());
+			}
 			tEmpDisabilityInfoService.saveOrUpdate(tEmpDisabilityInfo);
 		}
 
@@ -1236,7 +1248,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			}
 			tAttaInfoService.saveOrUpdateBatch(attaList);
 		}
-		return R.ok("保存档案成功！");
+		return R.ok("成功！");
 	}
 
 	// 2新增或更新项目
@@ -1650,16 +1662,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 		auditLog.setAuditResult(status);
 
 		R<PreEmpMainDetailVo> voR = this.getInfoById(id);
-		PreEmpMainDetailVo vo = null;
 		if (voR != null && voR.getCode() == CommonConstants.SUCCESS) {
 			// 转到更新档案去
-			vo = voR.getData();
-			this.updateById(preEmpMain);
+			PreEmpMainDetailVo vo = voR.getData();
 			tPreEmpMainLogService.save(auditLog);
+			this.updateById(preEmpMain);
+			if (CommonConstants.FOUR_STRING.equals(status)) {
 				return updateToEmployeeByPre(vo);
 			} else {
-			return R.failed("未找到信息，未更新！");
+				return R.ok("已审核");
 			}
+		} else {
+			return R.failed("未找到信息，未审核！");
+		}
+
 	}
 
 	@Override