lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

08-21-优化

Browse Source
This commit is contained in:
青云
2025-08-21 14:48:41 +08:00
parent 26a82c8f1f
commit 14432bc61e
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java
View File

@ -4,8 +4,11 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
@ -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; private String safeCertificateValidity;
/** /**

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java
View File

@ -7,6 +7,9 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date; 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;
/** /**
* 注册注册人员的数量 * 注册注册人员的数量

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java
View File

@ -1,5 +1,6 @@
package org.dromara.tender.domain.vo; package org.dromara.tender.domain.vo;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import org.dromara.tender.domain.TenderSupplierInput; import org.dromara.tender.domain.TenderSupplierInput;
@ -114,13 +115,14 @@ public class TenderSupplierInputVo implements Serializable {
* 发证日期 * 发证日期
*/ */
@ExcelProperty(value = "发证日期") @ExcelProperty(value = "发证日期")
private Date issueDate; private String issueDate;
/** /**
* 证书有效期 * 证书有效期
*/ */
@ExcelProperty(value = "证书有效期") @ExcelProperty(value = "证书有效期")
private Date certificateValidity; private String certificateValidity;
// private LocalDateTime certificateValidity;
/** /**
* 近三年营业额 * 近三年营业额
@ -138,7 +140,7 @@ public class TenderSupplierInputVo implements Serializable {
* 安全生产许可证发证日期 * 安全生产许可证发证日期
*/ */
@ExcelProperty(value = "安全生产许可证发证日期") @ExcelProperty(value = "安全生产许可证发证日期")
private Date safeCodeData; private String safeCodeData;
/** /**
* 证书有效期 * 证书有效期