From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
index 17b08cf..c38c6bf 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
@@ -1,33 +1,36 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 鑰冩牳绉垎鏄庣粏瀵硅薄 t_check_score
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@Data
-public class CheckScore
+@TableName("t_check_score")
+public class CheckScore extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
+
private Long id;
/** 鍒嗗�� */
@Excel(name = "鍒嗗��")
private BigDecimal score;
+
/** deptid */
@Excel(name = "鍖哄幙")
@@ -36,14 +39,15 @@
/** 鑰冩牳妯℃澘id */
@Excel(name = "鑰冩牳妯℃澘id")
private Integer templateId;
-
+ /** 瀵瑰簲check_index_琛╥d */
+ private Long indexId;
/** 鑰冩牳鏍囩(鐪佸巺/甯傚眬) */
@Excel(name = "鑰冩牳鏍囩(鐪佸巺/甯傚眬)")
private Integer examineTag;
/** 鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛) */
@Excel(name = "鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛)")
- private Integer examineCategory;
+ private Short examineCategory;
/** 淇敼鏃堕棿 */
@Excel(name = "淇敼鏃堕棿")
private Date updateTime;
@@ -60,5 +64,16 @@
private String publish;
//鎶樼嚎鍥炬棩鏈熷弬鏁�
+ @TableField(exist = false)
private String date;
+
+ @TableField(exist = false)
+ private Date startDate;
+
+ @TableField(exist = false)
+ private Date endDate;
+
+ @TableField(exist = false)
+ private List<String> quarter;
+
}
--
Gitblit v1.8.0