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 | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 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 2a8f07d..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; @@ -64,18 +63,23 @@ * 候选人数量 */ @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; /** * 评优数量 */ @@ -84,8 +88,11 @@ /** * 最终截止日期 */ - @ApiModelProperty(value = "最终截止日期") - private Date evaluateCutoffTime; + @ApiModelProperty(value = "最终评选开始日期") + private Date evaluateCutoffTimeStart; + + @ApiModelProperty(value = "最终评选结束日期") + private Date evaluateCutoffTimeEnd; /** * 评优评选状态 */ -- Gitblit v1.9.3