From cd15c2d9596401ef61ba16088e9f8fd01feb664c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 18 Dec 2023 11:13:36 +0800
Subject: [PATCH] 所有部门api
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 7174359..2a8f07d 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,10 @@
*/
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;
@@ -31,10 +34,16 @@
* @since 2023-12-08
*/
@Data
-@TableName("yw_evaluate_task")
+@TableName(value = "yw_evaluate_task", autoResultMap = true)
@ApiModel(value = "EvaluateTask对象", description = "评优任务表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskEntity extends TenantEntity {
+
+ /**
+ * 评优类型（0：员工评优，1：部门评优）
+ */
+ @ApiModelProperty(value = "评优类型")
+ private Integer type;
/**
* 任务名称
@@ -55,7 +64,8 @@
* 候选人数量
*/
@ApiModelProperty(value = "候选人数量")
- private String candidateNum;
+ @TableField(value = "candidate_num", typeHandler = JacksonTypeHandler.class)
+ private Object candidateNum;
/**
* 候选人截止日期
*/
@@ -72,9 +82,9 @@
@ApiModelProperty(value = "评优数量")
private Integer evaluateNum;
/**
- * 候选人截止日期
+ * 最终截止日期
*/
- @ApiModelProperty(value = "候选人截止日期")
+ @ApiModelProperty(value = "最终截止日期")
private Date evaluateCutoffTime;
/**
* 评优评选状态
--
Gitblit v1.9.3