From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 a974a40..b7db85b 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java
@@ -16,7 +16,9 @@
*/
package org.springblade.modules.evaluate.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,7 +34,7 @@
* @since 2024-01-05
*/
@Data
-@TableName("yw_evaluate_task")
+@TableName( value = "yw_evaluate_task",autoResultMap = true)
@ApiModel(value = "EvaluateTask对象", description = "评优任务表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskEntity extends TenantEntity {
@@ -47,6 +49,16 @@
*/
@ApiModelProperty(value = "任务名称")
private String taskName;
+ /**
+ * 评优奖项
+ */
+ @ApiModelProperty(value = "评优奖项")
+ private String evaluateAwards;
+ /**
+ * 认定标准
+ */
+ @ApiModelProperty(value = "认定标准")
+ private String identificationStandard;
/**
* 第一轮开始日期
*/
@@ -67,6 +79,13 @@
*/
@ApiModelProperty(value = "投票人员（多个用,分开）")
private String pollingPersons;
+
+ /**
+ * 投票人员明细
+ */
+ @ApiModelProperty(value = "投票人员明细")
+ @TableField(value = "vote_person_obj_info", typeHandler = JacksonTypeHandler.class)
+ private Object votePersonObjInfo;
/**
* 第二轮开始日期
*/
@@ -83,4 +102,10 @@
@ApiModelProperty(value = "评优评选状态（1进行中/0未开始）")
private Integer evaluateState;
+ /**
+ * 部门是否可以自选（0不可以1可以）
+ */
+ @ApiModelProperty(value = "部门是否可以自选（0不可以1可以）")
+ private Integer isSelfDept;
+
}
--
Gitblit v1.9.3