From 71f61d13531b3e2a0099ba5afe3f268c99c5bacf Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 29 五月 2025 18:13:33 +0800
Subject: [PATCH] 修改大屏录像可用率指标,点位在线指标,数据中心录像可用率,

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
index 6252ece..6af1baa 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
@@ -6,12 +6,11 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.time.LocalDateTime;
+
+import enumeration.general.CalculateReportStatusEnum;
 import org.springframework.lang.NonNull;
 import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 鏍哥畻鎶ュ憡灞曠ず
@@ -20,11 +19,16 @@
  * @since 2024-04-23
  */
 @Data
-@Accessors(chain = true)
 public class CalculateReportVO extends AbsVo {
 
     /** 鍚堝悓 */
     private Integer contractId;
+
+    /** 杩愮淮鍗曚綅 */
+    private String unitName;
+
+    /** 鍚堝悓鍚嶇О */
+    private String contractName;
 
     /** 鏍哥畻鏃ユ湡 */
     private LocalDateTime calculateTime;
@@ -32,14 +36,26 @@
     /** 鎵e噺鎬婚噾棰� */
     private BigDecimal deductMoney;
 
-    /** 鍝勾鐨� */
-    private Integer whichYear;
-
-    /** 鍝湀鐨� */
-    private Integer whichMonth;
-
     /** 淇敼浜� */
-    private Long updateBy;
+    private String updateBy;
+
+    /** 鏈�杩戜竴娆℃牳绠楁椂闂� */
+    private LocalDateTime latestTime;
+
+    /** 鑳藉惁鍙戝竷 */
+    private Boolean canPublish;
+
+    private CalculateReportStatusEnum status;
+
+    /** 鏈�鏂颁竴娆℃墸娆� */
+    private BigDecimal latestDeductMoney;
+
+    /** 鏄庣粏 */
+    private List<CalculateRecordVO> recordList;
+
+    private Integer whichYear;
+    private Integer whichMonth;
+    private Integer latestMonth;
 
     public static CalculateReportVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportVO vo) {
         if(vo == null) {

--
Gitblit v1.8.0