合同终止离职日期和减少原因必填

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

@@ -49,6 +49,8 @@ public class EmployeeConstants {
 	public static final String POST_EMPTY = "合同岗位不能为空";
 	public static final String WORKING_HOURS_EMPTY = "工时制不能为空";
 
+	public static final String CONTRACT_REDUCE_INFO_NOT_EMPTY = "合同终止时离职日期和减少原因必填";
+
 	/**
 	 * 无数据可更新
 	 **/

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

@@ -857,6 +857,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			} else {
 				if (EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())
 						|| EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
+					// 终止  离职日期 和减少原因必填
+					if (EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())
+							&& (Common.isEmpty(insert.getReduceReason())
+							|| Common.isEmpty(insert.getLeaveDate()))){
+						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeConstants.CONTRACT_REDUCE_INFO_NOT_EMPTY));
+						return;
+					}
 					TEmployeeContractInfo contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 							.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
 							.eq(TEmployeeContractInfo::getDeptNo, insert.getDeptNo())

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -175,7 +175,7 @@ emp.dispatch.social.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u
 
 emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u201C\u8D77\u7F34\u65E5\u671F\u201D\u8D85\u51FA\u516C\u79EF\u91D1\u6237\u53EF\u8865\u7F34\u7684\u6708\u4EFD\uFF0C\u8BF7\u4FEE\u6539
 
-emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u7F34\u65F6\u95F4\u3001\u5408\u540C\u7C7B\u578B\u3001\u7B7E\u8BA2\u671F\u9650\u5FC5\u586B\u4E0D\u53EF\u4E3A\u7A7A
+emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u59CB\u65F6\u95F4\u3001\u5408\u540C\u7C7B\u578B\u3001\u7B7E\u8BA2\u671F\u9650\u5FC5\u586B\u4E0D\u53EF\u4E3A\u7A7A
 
 emp.dispatch.emp.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u4EBA\u5458\u7684\u9879\u76EE\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u6309\u7167\u201C\u64CD\u4F5C\u8BF4\u660E\u201D\u5C06\u201C\u6863\u6848\u201D\u53CA\u201C\u5408\u540C\u4FE1\u606F\u201D\u8865\u5145\u5B8C\u6574