From ffaa6ca7eab630bf64f66e687f835dcd57f39f1a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 09:04:38 +0800
Subject: [PATCH] 查询考核列表异常
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
index 7174359..ebce901 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
@@ -20,7 +20,9 @@
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
import java.util.Date;
+
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -31,10 +33,16 @@
* @since 2023-12-08
*/
@Data
-@TableName("yw_evaluate_task")
+@TableName(value = "yw_evaluate_task", autoResultMap = true)
@ApiModel(value = "EvaluateTask对象", description = "评优任务表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskEntity extends TenantEntity {
+
+ /**
+ * 评优类型（0：员工评优，1：部门评优）
+ */
+ @ApiModelProperty(value = "评优类型")
+ private Integer type;
/**
* 任务名称
@@ -55,27 +63,36 @@
* 候选人数量
*/
@ApiModelProperty(value = "候选人数量")
- private String candidateNum;
+ private Integer candidateNum;
/**
* 候选人截止日期
*/
- @ApiModelProperty(value = "候选人截止日期")
- private Date candidateCutoffTime;
+ @ApiModelProperty(value = "候选人评选开始日期")
+ private Date candidateCutoffTimeStart;
+
+ @ApiModelProperty(value = "候选人评选开始截止日期")
+ private Date candidateCutoffTimeEnd;
/**
* 候选人状态
*/
@ApiModelProperty(value = "候选人状态")
private Integer candidateState;
+
+ @ApiModelProperty(value = "是否第二波")
+ private Integer isAgain;
/**
* 评优数量
*/
@ApiModelProperty(value = "评优数量")
private Integer evaluateNum;
/**
- * 候选人截止日期
+ * 最终截止日期
*/
- @ApiModelProperty(value = "候选人截止日期")
- private Date evaluateCutoffTime;
+ @ApiModelProperty(value = "最终评选开始日期")
+ private Date evaluateCutoffTimeStart;
+
+ @ApiModelProperty(value = "最终评选结束日期")
+ private Date evaluateCutoffTimeEnd;
/**
* 评优评选状态
*/
--
Gitblit v1.9.3