From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
index 5817fb5..ee49511 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
@@ -1,9 +1,11 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CalculateRecord;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -20,20 +22,16 @@
* @since 2024-04-23
*/
@Data
-public class CalculateRecordVO extends AbsVo {
+public class CalculateRecordVO {
- /** 鏍哥畻瑙勫垯 */
- private Integer ruleId;
- private String ruleName;
- /** 鎵ｅ噺鏂瑰紡 */
- private String deductCategory;
- /** 瑙勫垯鎻忚堪 */
- private String ruleDesc;
- /** 瑙勫垯鏉′欢 */
- private String ruleCondition;
+ private Integer id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
/** 鍚堝悓 */
private Integer contractId;
+
private String contractName;
/** 鎵ｅ噺鏈嶅姟璐� */
@@ -42,6 +40,15 @@
/** 鑰冩牳鍒嗘暟 */
private BigDecimal score;
+ /** 鍝勾 */
+ private Integer whichYear;
+
+ /** 鍝湀 */
+ private Integer whichMonth;
+
+ /** 鏈�鏂颁竴鏉℃牳绠楁爣璇� */
+ private Boolean latest;
+
public static CalculateRecordVO getVoByEntity(@NonNull CalculateRecord entity, CalculateRecordVO vo) {
if(vo == null) {
vo = new CalculateRecordVO();
--
Gitblit v1.8.0