基础档案新增字段及必填调整

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

@@ -50,6 +50,7 @@ public class EmployeeConstants {
 	public static final String CONTRACT_TYPE_ONE = "1";
 	public static final String CONTRACT_NO_IN_USE = "暂无可操作的合同";
 
+	public static final String CONTRACT_TRY_PERIOD_EMPTY = "试用期不能为空";
 	public static final String CONTRACT_NAME_EMPTY = "合同类型不能为空";
 	public static final String CONTRACT_PARTY_EMPTY = "合同甲方不能为空";
 	public static final String CONTRACT_TYPE_EMPTY = "签订期限不能为空";

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

@@ -1134,6 +1134,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			if (Common.isEmpty(insert.getEmpIdcard()) || Common.isEmpty(insert.getDeptNo())) {
 				errorInfo.append(EmployeeConstants.EMPID_NOT_EMPTY);
 			} else {
+				//签订类型为 新签 试用期必填
+				if (EmployeeConstants.SITUATION_ONE.equals(insert.getSituation()) && Common.isEmpty(insert.getTryPeriod())) {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeConstants.CONTRACT_TRY_PERIOD_EMPTY));
+					return;
+				}
 				//签订类型不是终止的把是否同步终止合同、减项、减档设为空
 				if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
 					insert.setChangeContractAndEmployee(null);