Merge branch 'develop' into feature-licancan

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeContractConstants.java

@@ -8,5 +8,7 @@ public class EmployeeContractConstants {
 	public static final String NOT_CREATE_USER = "不是创建人，无法删除";
 
 	public static final String NOT_AUDIT_STATUS = "不是待提交或审核不通过，无法删除";
+	public static final String NOT_AUDIT = "未审核通过，无法更新";
+	public static final String INVALID = "作废、终止，无法更新";
 
 }

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

@@ -668,16 +668,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						// 存储
 						contractInfo = baseMapper.getOneContractByApplyNo(excel.getApplyNo());
 						if (contractInfo != null && Common.isNotNull(contractInfo.getId())) {
-							newContractInfo = new TEmployeeContractInfo();
-							newContractInfo.setId(contractInfo.getId());
-							newContractInfo.setContractNo(excel.getContractNo());
-							newContractInfo.setFileCabinetNo(excel.getFileCabinetNo());
-							this.updateById(newContractInfo);
-
-							// 记录变更日志
-							tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[3], contractInfo.getId(), "", contractInfo, newContractInfo);
-
-							errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
+							if (CommonConstants.dingleDigitIntArray[2] != contractInfo.getAuditStatus()) {
+								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeContractConstants.NOT_AUDIT));
+							} else if (EmployeeConstants.SITUATION_SIX.equals(contractInfo.getSituation())
+									|| EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation())) {
+								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeContractConstants.INVALID));
+							} else {
+								newContractInfo = new TEmployeeContractInfo();
+								newContractInfo.setId(contractInfo.getId());
+								newContractInfo.setContractNo(excel.getContractNo());
+								newContractInfo.setFileCabinetNo(excel.getFileCabinetNo());
+								this.updateById(newContractInfo);
+								// 记录变更日志
+								tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[3], contractInfo.getId(), "", contractInfo, newContractInfo);
+								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
+							}
 						} else {
 							errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeContractConstants.NO_INFO));
 						}