From 856f3f334b7d17615a79b99e16a157dd314924f2 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Sat, 18 Oct 2025 20:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzd/domain/XzdContractAgreement.java | 18 ++++++------- .../xzd/domain/bo/XzdContractAgreementBo.java | 25 ++++++++++--------- .../xzd/domain/vo/XzdContractAgreementVo.java | 19 +++++++------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java index 87154169..58495e66 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java @@ -1,14 +1,14 @@ package org.dromara.xzd.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDate; /** * 合作协议对象 xzd_contract_agreement @@ -43,7 +43,7 @@ public class XzdContractAgreement extends BaseEntity { /** * 单据日期 */ - private Date documentDate; + private LocalDate documentDate; /** * 甲方单位 @@ -68,7 +68,7 @@ public class XzdContractAgreement extends BaseEntity { /** * 签订日期 */ - private Date signingDate; + private LocalDate signingDate; /** * 合同含税总金额 @@ -88,12 +88,12 @@ public class XzdContractAgreement extends BaseEntity { /** * 开始日期 */ - private Date startDate; + private LocalDate startDate; /** * 结束日期 */ - private Date endDate; + private LocalDate endDate; /** * 支付条款 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java index d53d206b..5d7d59fc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAgreementBo.java @@ -1,16 +1,17 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdContractAgreement; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdContractAgreement; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 合作协议业务对象 xzd_contract_agreement @@ -41,8 +42,8 @@ public class XzdContractAgreementBo extends BaseEntity { /** * 单据日期 */ - @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date documentDate; + @NotNull(message = "单据日期不能为空", groups = {AddGroup.class, EditGroup.class}) + private LocalDate documentDate; /** * 甲方单位 @@ -68,7 +69,7 @@ public class XzdContractAgreementBo extends BaseEntity { /** * 签订日期 */ - private Date signingDate; + private LocalDate signingDate; /** * 合同含税总金额 @@ -78,7 +79,7 @@ public class XzdContractAgreementBo extends BaseEntity { /** * 协议类型 */ - @NotBlank(message = "协议类型不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "协议类型不能为空", groups = {AddGroup.class, EditGroup.class}) private String agreementType; /** @@ -94,12 +95,12 @@ public class XzdContractAgreementBo extends BaseEntity { /** * 开始日期 */ - private Date startDate; + private LocalDate startDate; /** * 结束日期 */ - private Date endDate; + private LocalDate endDate; /** * 支付条款 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java index f755ce37..e6baf68f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAgreementVo.java @@ -1,18 +1,17 @@ package org.dromara.xzd.domain.vo; -import java.math.BigDecimal; -import java.util.Date; - -import org.dromara.xzd.domain.XzdContractAgreement; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.xzd.domain.XzdContractAgreement; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; /** @@ -51,7 +50,7 @@ public class XzdContractAgreementVo implements Serializable { * 单据日期 */ @ExcelProperty(value = "单据日期") - private Date documentDate; + private LocalDate documentDate; /** * 甲方单位 @@ -90,7 +89,7 @@ public class XzdContractAgreementVo implements Serializable { * 签订日期 */ @ExcelProperty(value = "签订日期") - private Date signingDate; + private LocalDate signingDate; /** * 合同含税总金额 @@ -119,13 +118,13 @@ public class XzdContractAgreementVo implements Serializable { * 开始日期 */ @ExcelProperty(value = "开始日期") - private Date startDate; + private LocalDate startDate; /** * 结束日期 */ @ExcelProperty(value = "结束日期") - private Date endDate; + private LocalDate endDate; /** * 支付条款