From f24b378fe6fd2dd0f31c10d9cafbe1d490d98c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 20 Jan 2024 11:21:04 +0800
Subject: [PATCH] 1

---
 src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java |   17 ++++++++++++++++-
 1 files changed, 16 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 7719728..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 {
@@ -77,6 +79,13 @@
 	 */
 	@ApiModelProperty(value = "投票人员(多个用,分开)")
 	private String pollingPersons;
+
+	/**
+	 * 投票人员明细
+	 */
+	@ApiModelProperty(value = "投票人员明细")
+	@TableField(value = "vote_person_obj_info", typeHandler = JacksonTypeHandler.class)
+	private Object votePersonObjInfo;
 	/**
 	 * 第二轮开始日期
 	 */
@@ -93,4 +102,10 @@
 	@ApiModelProperty(value = "评优评选状态(1进行中/0未开始)")
 	private Integer evaluateState;
 
+	/**
+	 * 部门是否可以自选(0不可以1可以)
+	 */
+	@ApiModelProperty(value = "部门是否可以自选(0不可以1可以)")
+	private Integer isSelfDept;
+
 }

--
Gitblit v1.9.3