From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
index 8fb2927..0b52092 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -21,25 +22,34 @@
//鏌ヨ鏉′欢锛屾棩鏈�
@TableField(exist = false)
public String day;
-
- @Excel(name = "鏃ユ湡",dateFormat = "yyyy-MM-dd")
- @TableField("create_time")
- public Date createTime;
@TableField("dept_id")
public Long deptId;
- @Excel(name = "鍖哄幙")
- @TableField(exist = false)
- public String deptName;
-
/** 鑰冩牳鏍囩锛堢渷鍘�/甯傚眬锛� */
@TableField("examine_tag")
public Short examineTag;
+ @TableField("create_time")
+ public Date createTime;
+
+ @Excel(name = "鏃ユ湡")
+ @TableField(exist = false)
+ public String createTimeStr;
+ @Excel(name = "鍖哄幙")
+ @TableField(exist = false)
+ public String deptName;
@Excel(name = "鑰冩牳鏍囩")
@TableField(exist = false)
public String examineTagStr;
+ /** 寰楀垎 */
+ @Excel(name = "寰楀垎")
+ @TableField(exist = false)
+ private BigDecimal score;
+
@TableField(exist = false)
public List<Integer> deptIds;
-
+ @TableField(exist = false)
+ public List<Integer> examineTags;
+ @TableField(exist = false)
+ public List<Integer> examineCategories;
/** 璇锋眰鍙傛暟 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
--
Gitblit v1.8.0