From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 182 +++++++++++++++++----------------------------
1 files changed, 70 insertions(+), 112 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
index d5924f9..baacc38 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
@@ -1,11 +1,17 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import enumeration.general.AuditingStatus;
+import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* 鍚堝悓鎵撳垎瀵硅薄 t_default_score
@@ -13,137 +19,89 @@
* @author ruoyi
* @date 2024-04-01
*/
-public class ContractScore extends BaseEntity
-{
+@Data
+@TableName("t_contract_score")
+public class ContractScore {
private static final long serialVersionUID = 1L;
- /** */
private Long id;
- /** 鍚堝悓鑰冩牳id */
- @Excel(name = "鍚堝悓鑰冩牳id")
- private Long publishId;
+ private Long unitId;
- /** 妯℃澘id */
- @Excel(name = "妯℃澘id")
- private Long templateId;
+ @Excel(name = "杩愮淮鍗曚綅")
+ @TableField(exist = false)
+ private String unitName;
- /** 鍏蜂綋鏁伴噺銆佷釜鏁般�佸皬鏃舵暟 */
- @Excel(name = "鍏蜂綋鏁伴噺銆佷釜鏁般�佸皬鏃舵暟")
+ private Long contractId;
+
+ @Excel(name = "鍚堝悓")
+ @TableField(exist = false)
+ private String contractName;
+
+ private Long ruleId;
+ private String ruleIds;
+ @TableField(exist = false)
+ private List<String> ruleIdsArray;
+
+ @Excel(name = "瑙勫垯")
+ private String ruleName;
+
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private String deductCategory;
+
+ @Excel(name = "鎸囨爣")
private String num;
- /** 鏍规嵁rule鐨勬墦鍒嗘柟寮忕粨鍚坱emplate鎵ｅ垎绯绘暟鍜宯um,绯荤粺璁＄畻鐨勫垎鏁� */
- @Excel(name = "鏍规嵁rule鐨勬墦鍒嗘柟寮忕粨鍚坱emplate鎵ｅ垎绯绘暟鍜宯um,绯荤粺璁＄畻鐨勫垎鏁�")
+ @Excel(name = "鍒嗘暟")
private BigDecimal score;
- /** */
- private Long createUser;
+ private Long createUserId;
- /** */
- private String createUserName;
+ @Excel(name = "鍒涘缓浜�")
+ private String createUser;
- /** */
- private Long updateUser;
+ private Long auditingUserId;
- /** */
- private String updateUserName;
+ @Excel(name = "瀹℃牳浜�")
+ private String auditingUser;
- public void setId(Long id)
- {
- this.id = id;
- }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
+ @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
- public Long getId()
- {
- return id;
- }
- public void setPublishId(Long publishId)
- {
- this.publishId = publishId;
- }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date auditingTime;
- public Long getPublishId()
- {
- return publishId;
- }
- public void setTemplateId(Long templateId)
- {
- this.templateId = templateId;
- }
+ @Excel(name = "瀹℃牳鐘舵��", readConverterExp = "PASS=閫氳繃,NO_PASS=鏈�氳繃,WAIT=寰呭鏍�")
+ private AuditingStatus auditingStatus;
- public Long getTemplateId()
- {
- return templateId;
- }
- public void setNum(String num)
- {
- this.num = num;
- }
+ @Excel(name = "瀹℃牳璇存槑")
+ private String remark;
- public String getNum()
- {
- return num;
- }
- public void setScore(BigDecimal score)
- {
- this.score = score;
- }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateTime;
- public BigDecimal getScore()
- {
- return score;
- }
- public void setCreateUser(Long createUser)
- {
- this.createUser = createUser;
- }
+ @TableLogic
+ private Integer deleted;
- public Long getCreateUser()
- {
- return createUser;
- }
- public void setCreateUserName(String createUserName)
- {
- this.createUserName = createUserName;
- }
+ //鏌ヨ鏉′欢
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createStartTime;
- public String getCreateUserName()
- {
- return createUserName;
- }
- public void setUpdateUser(Long updateUser)
- {
- this.updateUser = updateUser;
- }
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createEndTime;
- public Long getUpdateUser()
- {
- return updateUser;
- }
- public void setUpdateUserName(String updateUserName)
- {
- this.updateUserName = updateUserName;
- }
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date auditingStartTime;
- public String getUpdateUserName()
- {
- return updateUserName;
- }
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date auditingEndTime;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("publishId", getPublishId())
- .append("templateId", getTemplateId())
- .append("num", getNum())
- .append("score", getScore())
- .append("createUser", getCreateUser())
- .append("createUserName", getCreateUserName())
- .append("updateUser", getUpdateUser())
- .append("updateUserName", getUpdateUserName())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .toString();
- }
}
--
Gitblit v1.8.0