Commit 437b2824 authored by hongguangwu's avatar hongguangwu

空导出

parent 1ad2009a
...@@ -132,12 +132,12 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -132,12 +132,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema(description = "客户名称", name = "subjectUnit") @Schema(description = "客户名称", name = "subjectUnit")
private String subjectUnit; private String subjectUnit;
/** /**
* 签订类型 * 签订类型(字典也是汉字
*/ */
@NotBlank(message = "签订类型不能为空") @NotBlank(message = "签订类型不能为空")
@Length(max = 1, message = "签订类型不能超过1个字符") @Length(max = 1, message = "签订类型不能超过1个字符")
@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 100, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE) @ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 100)
@Schema(description = "签订类型(字典)", name = "situation") @Schema(description = "签订类型(字典也是汉字)", name = "situation")
private String situation; private String situation;
/** /**
* 合同年限 * 合同年限
......
...@@ -32,6 +32,8 @@ public class EmployeeConstants { ...@@ -32,6 +32,8 @@ public class EmployeeConstants {
public static final String DEPT_NO_EXIST = "根据项目编码未找到项目"; public static final String DEPT_NO_EXIST = "根据项目编码未找到项目";
public static final String CHECK_ERROR = "校验服务错误,请联系管理员!"; public static final String CHECK_ERROR = "校验服务错误,请联系管理员!";
public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!"; public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!";
public static final String SITUATION_SIX = "作废";
public static final String SITUATION_SEVEN = "终止";
/** /**
* 无数据可更新 * 无数据可更新
......
...@@ -407,8 +407,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -407,8 +407,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[2]) { if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[2]) {
// 作废、终止,不变为在用 // 作废、终止,不变为在用
if (Common.isEmpty(contractInfo.getSituation()) if (Common.isEmpty(contractInfo.getSituation())
|| (!CommonConstants.dingleDigitStrArray[6].equals(contractInfo.getSituation()) || (!EmployeeConstants.SITUATION_SIX.equals(contractInfo.getSituation())
&& !CommonConstants.dingleDigitStrArray[7].equals(contractInfo.getSituation()))) { && !EmployeeConstants.SITUATION_SIX.equals(contractInfo.getSituation()))) {
tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING); tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
} }
tEmployeeContractInfo.setAuditTimeLast(LocalDateTime.now()); tEmployeeContractInfo.setAuditTimeLast(LocalDateTime.now());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment