From 84a8f49e9522051f6e5bcf969eb03c6c4824d098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 29 Oct 2025 19:32:36 +0800
Subject: [PATCH] =?UTF-8?q?10-29-LocalDate=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/xzd/domain/XzdContractSkxx.java   | 3 ++-
 .../java/org/dromara/xzd/domain/XzdSupplierSupplement.java  | 6 ++----
 .../java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java   | 3 ++-
 .../xzd/service/impl/XzdSupplierInfoServiceImpl.java        | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractSkxx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractSkxx.java
index 62857fea..d7f600b6 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractSkxx.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractSkxx.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -82,7 +83,7 @@ public class XzdContractSkxx extends BaseEntity {
     /**
      * 累计审批金额
      */
-    private Long ljspje;
+    private BigDecimal ljspje;
 
     /**
      * 数据来源
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java
index 798ee04a..2e96c022 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java
@@ -2,11 +2,9 @@ package org.dromara.xzd.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.time.LocalDate;
@@ -69,8 +67,8 @@ public class XzdSupplierSupplement extends BaseEntity {
     /**
      * 创建日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate createDate;
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java
index aca043a7..551aa9f1 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java
@@ -8,6 +8,7 @@ import org.dromara.xzd.domain.XzdContractSkxx;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 
@@ -94,7 +95,7 @@ public class XzdContractSkxxVo implements Serializable {
      * 累计审批金额
      */
     @ExcelProperty(value = "累计审批金额")
-    private LocalDate ljspje;
+    private BigDecimal ljspje;
 
     /**
      * 数据来源
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
index 174f2f79..fd01a713 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
@@ -34,6 +34,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -237,7 +238,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
             bo.getSupplement().setSupplierId(add.getId());
             if (LoginHelper.getLoginUser() != null){
                 bo.getSupplement().setCreator(LoginHelper.getLoginUser().getNickname());
-                bo.getSupplement().setCreateDate(new Date());
+                bo.getSupplement().setCreateDate(LocalDate.now());
             }else {
                 bo.getSupplement().setCreator("暂无");
             }