From a4baf57cb433dfcee1c58a7d9d3f96f34ffbd697 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 11:31:52 +0800
Subject: [PATCH] 用户手机号码查询
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 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 40a5828..7719728 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
@@ -16,74 +16,81 @@
*/
package org.springblade.modules.evaluate.entity;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
/**
* 评优任务表 实体类
*
* @author aix
- * @since 2023-12-08
+ * @since 2024-01-05
*/
@Data
-@TableName(value = "yw_evaluate_task", autoResultMap = true)
+@TableName("yw_evaluate_task")
@ApiModel(value = "EvaluateTask对象", description = "评优任务表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskEntity extends TenantEntity {
+ /**
+ * 评优类型（0：员工评优，1：部门评优）
+ */
+ @ApiModelProperty(value = "评优类型（0：员工评优，1：部门评优）")
+ private Integer type;
/**
* 任务名称
*/
@ApiModelProperty(value = "任务名称")
private String taskName;
/**
- * 任务类别
+ * 评优奖项
*/
- @ApiModelProperty(value = "任务类别")
- private String taskType;
+ @ApiModelProperty(value = "评优奖项")
+ private String evaluateAwards;
/**
- * 认定标准描述
+ * 认定标准
*/
- @ApiModelProperty(value = "认定标准描述")
- private String remark;
+ @ApiModelProperty(value = "认定标准")
+ private String identificationStandard;
/**
- * 候选人数量
+ * 第一轮开始日期
*/
- @ApiModelProperty(value = "候选人数量")
- @TableField(value = "candidate_num", typeHandler = JacksonTypeHandler.class)
- private Object candidateNum;
+ @ApiModelProperty(value = "第一轮开始日期")
+ private Date candidateCutoffTimeStart;
/**
- * 候选人截止日期
+ * 第一轮结束日期
*/
- @ApiModelProperty(value = "候选人截止日期")
- private Date candidateCutoffTime;
+ @ApiModelProperty(value = "第一轮结束日期")
+ private Date candidateCutoffTimeEnd;
/**
- * 候选人状态
+ * 候选人状态（2已结束/1进行中）
*/
- @ApiModelProperty(value = "候选人状态")
+ @ApiModelProperty(value = "候选人状态（2已结束/1进行中）")
private Integer candidateState;
/**
- * 评优数量
+ * 投票人员（多个用,分开）
*/
- @ApiModelProperty(value = "评优数量")
- private Integer evaluateNum;
+ @ApiModelProperty(value = "投票人员（多个用,分开）")
+ private String pollingPersons;
/**
- * 候选人截止日期
+ * 第二轮开始日期
*/
- @ApiModelProperty(value = "候选人截止日期")
- private Date evaluateCutoffTime;
+ @ApiModelProperty(value = "第二轮开始日期")
+ private Date evaluateCutoffTimeStart;
/**
- * 评优评选状态
+ * 第二轮结束日期
*/
- @ApiModelProperty(value = "评优评选状态")
+ @ApiModelProperty(value = "第二轮结束日期")
+ private Date evaluateCutoffTimeEnd;
+ /**
+ * 评优评选状态（1进行中/0未开始）
+ */
+ @ApiModelProperty(value = "评优评选状态（1进行中/0未开始）")
private Integer evaluateState;
}
--
Gitblit v1.9.3