From d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 11:56:13 +0800
Subject: [PATCH] 考核任务设置被考核人
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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..ebce901 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
@@ -16,14 +16,13 @@
*/
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.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -38,6 +37,12 @@
@ApiModel(value = "EvaluateTask对象", description = "评优任务表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskEntity extends TenantEntity {
+
+ /**
+ * 评优类型（0：员工评优，1：部门评优）
+ */
+ @ApiModelProperty(value = "评优类型")
+ private Integer type;
/**
* 任务名称
@@ -58,28 +63,36 @@
* 候选人数量
*/
@ApiModelProperty(value = "候选人数量")
- @TableField(value = "candidate_num", typeHandler = JacksonTypeHandler.class)
- private Object 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