From d384786ab5868cd4d856691372eee5359e7d9b2c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 28 三月 2025 17:48:47 +0800
Subject: [PATCH] 导出新增 连个列，以及同步数据库时点位名修改未成功问题
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 ba81f0a..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;
/**
* 鏍哥畻鎶ュ憡灞曠ず
@@ -37,14 +36,26 @@
/** 鎵ｅ噺鎬婚噾棰� */
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