From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null,为前端添加数据默认为0
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 030bc2c..94b02f6 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
@@ -6,18 +6,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
-import lombok.experimental.Accessors;
-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.Map;
+import java.util.List;
/**
* 鑰冩牳绉垎鏄庣粏瀵硅薄 t_check_score
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@@ -35,20 +31,25 @@
@Excel(name = "鍒嗗��")
private BigDecimal score;
+
/** deptid */
@Excel(name = "鍖哄幙")
private Long deptId;
-
+ @TableField(exist = false)
+ private String deptName;
+ //璁惧鏁伴噺
+ private Integer deviceCount;
/** 鑰冩牳妯℃澘id */
@Excel(name = "鑰冩牳妯℃澘id")
private Integer templateId;
-
+ /** 瀵瑰簲check_index_琛╥d */
+ private Long indexId;
/** 鑰冩牳鏍囩(鐪佸巺/甯傚眬) */
@Excel(name = "鑰冩牳鏍囩(鐪佸巺/甯傚眬)")
private Integer examineTag;
- /** 鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛) */
- @Excel(name = "鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛)")
+ /** 鑰冩牳绫诲瀷(瑙嗛/杞﹁締/浜鸿劯) */
+ @Excel(name = "鑰冩牳绫诲瀷(瑙嗛/杞﹁締/浜鸿劯)")
private Short examineCategory;
/** 淇敼鏃堕棿 */
@Excel(name = "淇敼鏃堕棿")
@@ -69,4 +70,14 @@
@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