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

10-22-bug修复

Browse Source
This commit is contained in:
青云
2025-10-22 18:51:50 +08:00
parent 9ebf4a3e5f
commit 03161751fc
12 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCertificateInfo.java
View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import java.time.LocalDate; import java.time.LocalDate;
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;
@ -54,12 +55,16 @@ public class XzdCertificateInfo extends BaseEntity {
/** /**
* 生效日期 * 生效日期
*/ */
private LocalDate effectiveDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date effectiveDate;
/** /**
* 截止日期 * 截止日期
*/ */
private LocalDate expirationDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expirationDate;
/** /**
* 停用标志（0：未停用，1：已停用） * 停用标志（0：未停用，1：已停用）

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectInfo.java
View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import java.time.LocalDate; import java.time.LocalDate;
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;
@ -79,7 +80,9 @@ public class XzdProjectInfo extends BaseEntity {
/** /**
* 项目日期 * 项目日期
*/ */
private LocalDate projectDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate;
/** /**
* 管理组织 * 管理组织

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierQualification.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
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;
@ -42,11 +43,15 @@ public class XzdSupplierQualification extends BaseEntity {
/** /**
* 资质起始日期 * 资质起始日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** /**

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
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;
@ -82,11 +83,17 @@ public class XzdSupplierSupplement extends BaseEntity {
/** /**
* 冻结开始时间 * 冻结开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeStartTime; private Date freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeEndTime; private Date freezeEndTime;
/** /**
@ -112,6 +119,8 @@ public class XzdSupplierSupplement extends BaseEntity {
/** /**
* 合格有效期 * 合格有效期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date qualificationValidity; private Date qualificationValidity;
/** /**

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCertificateInfoBo.java
View File

@ -13,6 +13,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; 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;
/** /**
* 客户信息-证照信息4业务对象 xzd_certificate_info * 客户信息-证照信息4业务对象 xzd_certificate_info
@ -53,12 +54,16 @@ public class XzdCertificateInfoBo extends BaseEntity {
/** /**
* 生效日期 * 生效日期
*/ */
private LocalDate effectiveDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date effectiveDate;
/** /**
* 截止日期 * 截止日期
*/ */
private LocalDate expirationDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expirationDate;
/** /**
* 停用标志（0：未停用，1：已停用） * 停用标志（0：未停用，1：已停用）

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectInfoBo.java
View File

@ -13,6 +13,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; 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;
/** /**
* 客户信息-项目信息8业务对象 xzd_project_info * 客户信息-项目信息8业务对象 xzd_project_info
@ -78,7 +79,9 @@ public class XzdProjectInfoBo extends BaseEntity {
/** /**
* 项目日期 * 项目日期
*/ */
private LocalDate projectDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate;
/** /**
* 管理组织 * 管理组织

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierQualificationBo.java
View File

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
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;
/** /**
* 供应商资质信息业务对象 xzd_supplier_qualification * 供应商资质信息业务对象 xzd_supplier_qualification
@ -44,12 +45,16 @@ public class XzdSupplierQualificationBo extends BaseEntity {
* 资质起始日期 * 资质起始日期
*/ */
@NotNull(message = "资质起始日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "资质起始日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@NotNull(message = "资质到期日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "资质到期日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** /**

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java
View File

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
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;
/** /**
* 供应商信息补充业务对象 xzd_supplier_supplement * 供应商信息补充业务对象 xzd_supplier_supplement
@ -90,12 +91,16 @@ public class XzdSupplierSupplementBo extends BaseEntity {
* 冻结开始时间 * 冻结开始时间
*/ */
@NotNull(message = "冻结开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "冻结开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeStartTime; private Date freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@NotNull(message = "冻结结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "冻结结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeEndTime; private Date freezeEndTime;
/** /**
@ -126,6 +131,8 @@ public class XzdSupplierSupplementBo extends BaseEntity {
* 合格有效期 * 合格有效期
*/ */
@NotNull(message = "合格有效期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "合格有效期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date qualificationValidity; private Date qualificationValidity;
/** /**

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCertificateInfoVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -65,13 +66,17 @@ public class XzdCertificateInfoVo implements Serializable {
* 生效日期 * 生效日期
*/ */
@ExcelProperty(value = "生效日期") @ExcelProperty(value = "生效日期")
private LocalDate effectiveDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date effectiveDate;
/** /**
* 截止日期 * 截止日期
*/ */
@ExcelProperty(value = "截止日期") @ExcelProperty(value = "截止日期")
private LocalDate expirationDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expirationDate;
/** /**
* 停用标志（0：未停用，1：已停用） * 停用标志（0：未停用，1：已停用）

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectInfoVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -95,7 +96,9 @@ public class XzdProjectInfoVo implements Serializable {
* 项目日期 * 项目日期
*/ */
@ExcelProperty(value = "项目日期") @ExcelProperty(value = "项目日期")
private LocalDate projectDate; @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate;
/** /**
* 管理组织 * 管理组织

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierQualificationVo.java
View File

@ -9,6 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -52,12 +53,16 @@ public class XzdSupplierQualificationVo implements Serializable {
* 资质起始日期 * 资质起始日期
*/ */
@ExcelProperty(value = "资质起始日期") @ExcelProperty(value = "资质起始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private Date beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@ExcelProperty(value = "资质到期日期") @ExcelProperty(value = "资质到期日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** /**

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java
View File

@ -9,6 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -100,12 +101,16 @@ public class XzdSupplierSupplementVo implements Serializable {
/** /**
* 冻结开始时间 * 冻结开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "冻结开始时间") @ExcelProperty(value = "冻结开始时间")
private Date freezeStartTime; private Date freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "冻结结束时间") @ExcelProperty(value = "冻结结束时间")
private Date freezeEndTime; private Date freezeEndTime;
@ -136,6 +141,8 @@ public class XzdSupplierSupplementVo implements Serializable {
/** /**
* 合格有效期 * 合格有效期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "合格有效期") @ExcelProperty(value = "合格有效期")
private Date qualificationValidity; private Date qualificationValidity;