From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 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..db4f596 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,29 @@
/** 鎵ｅ噺鎬婚噾棰� */
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 whichDay;
+
+ private Integer latestMonth;
+ private Integer latestDay;
public static CalculateReportVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportVO vo) {
if(vo == null) {
--
Gitblit v1.8.0