From 14432bc61e7b90c937da756c7215d8a946380ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 21 Aug 2025 14:48:41 +0800 Subject: [PATCH] =?UTF-8?q?08-21-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TenderSupplierInputController.java | 2 +- .../tender/domain/TenderSupplierInput.java | 16 ++++++++++++---- .../tender/domain/bo/TenderSupplierInputBo.java | 16 ++++++++++++---- .../tender/domain/vo/TenderSupplierInputVo.java | 8 +++++--- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java index f7a0ed73..e84bb04d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java @@ -98,7 +98,7 @@ public class TenderSupplierInputController extends BaseController { public R edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) { return toAjax(tenderSupplierInputService.updateByBo(bo,file)); } - + /** * 删除供应商入库 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java index 963a468c..fa4d6a78 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java @@ -4,8 +4,11 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; @@ -24,7 +27,7 @@ public class TenderSupplierInput extends BaseEntity { private static final long serialVersionUID = 1L; /** - * + * */ @TableId(value = "id") private Long id; @@ -97,12 +100,15 @@ public class TenderSupplierInput extends BaseEntity { /** * 发证日期 */ - private Date issueDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String issueDate; /** * 证书有效期 */ - private Date certificateValidity; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String certificateValidity; +// private LocalDateTime certificateValidity; /** * 近三年营业额 @@ -117,11 +123,13 @@ public class TenderSupplierInput extends BaseEntity { /** * 安全生产许可证发证日期 */ - private Date safeCodeData; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String safeCodeData; /** * 证书有效期 */ +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String safeCertificateValidity; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java index 5ff11e27..3559d4a1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java @@ -7,6 +7,9 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; import java.util.Date; /** @@ -94,12 +97,15 @@ public class TenderSupplierInputBo extends BaseEntity { /** * 发证日期 */ - private Date issueDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String issueDate; /** * 证书有效期 */ - private Date certificateValidity; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String certificateValidity; +// private LocalDateTime certificateValidity; /** * 近三年营业额 @@ -114,12 +120,14 @@ public class TenderSupplierInputBo extends BaseEntity { /** * 安全生产许可证发证日期 */ - private Date safeCodeData; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String safeCodeData; /** * 证书有效期 */ - private Date safeCertificateValidity; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String safeCertificateValidity; /** * 注册注册人员的数量 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java index abd2da1d..d663161a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java @@ -1,5 +1,6 @@ package org.dromara.tender.domain.vo; +import java.time.LocalDateTime; import java.util.Date; import org.dromara.tender.domain.TenderSupplierInput; @@ -114,13 +115,14 @@ public class TenderSupplierInputVo implements Serializable { * 发证日期 */ @ExcelProperty(value = "发证日期") - private Date issueDate; + private String issueDate; /** * 证书有效期 */ @ExcelProperty(value = "证书有效期") - private Date certificateValidity; + private String certificateValidity; +// private LocalDateTime certificateValidity; /** * 近三年营业额 @@ -138,7 +140,7 @@ public class TenderSupplierInputVo implements Serializable { * 安全生产许可证发证日期 */ @ExcelProperty(value = "安全生产许可证发证日期") - private Date safeCodeData; + private String safeCodeData; /** * 证书有效期