diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java index 2d1c1014..1c9fdaba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java @@ -2,15 +2,13 @@ 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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同竣工结算对象 xzd_contract_account @@ -50,9 +48,9 @@ public class XzdContractAccount extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id @@ -87,9 +85,9 @@ public class XzdContractAccount extends BaseEntity { /** * 审定日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date approvedDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate approvedDate; /** * 项目id @@ -134,9 +132,9 @@ public class XzdContractAccount extends BaseEntity { /** * 竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date completionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate completionDate; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java index 0bd29917..98c3386d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java @@ -2,14 +2,12 @@ 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.util.Date; +import java.time.LocalDate; /** * 承包合同变更对象 xzd_contract_change @@ -49,9 +47,9 @@ public class XzdContractChange extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 所属部门 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java index d1b47c26..2fc3bb4e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java @@ -2,16 +2,13 @@ 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.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; /** * 承包合同信息对象 xzd_contract_details @@ -73,9 +70,9 @@ public class XzdContractDetails extends BaseEntity { /** * 签订日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date signingDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate signingDate; /** * 客户性质（字典） @@ -120,9 +117,9 @@ public class XzdContractDetails extends BaseEntity { /** * 归档日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingDate; /** * 支付方式（字典） @@ -192,9 +189,9 @@ public class XzdContractDetails extends BaseEntity { /** * 备案时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingTime; /** * 是否固定单价合同 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java index 7ad56c1d..42f01040 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlement.java @@ -2,14 +2,12 @@ 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.util.Date; +import java.time.LocalDate; /** * 承包合同进度结算对象 xzd_contract_progress_settlement @@ -59,14 +57,14 @@ public class XzdContractProgressSettlement extends BaseEntity { /** * 结算日期 */ - private Date settlementDate; + private LocalDate settlementDate; /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id @@ -101,12 +99,12 @@ public class XzdContractProgressSettlement extends BaseEntity { /** * 计量开始日期 */ - private Date meterageDateBegin; + private LocalDate meterageDateBegin; /** * 计量结束日期 */ - private Date meterageDateEnd; + private LocalDate meterageDateEnd; /** * 结算单位(客户) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlementDate.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlementDate.java index a8ba87ea..f4de7286 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlementDate.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlementDate.java @@ -1,12 +1,13 @@ 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.util.Date; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 承包合同进度结算周期对象 xzd_contract_progress_settlement_date @@ -36,12 +37,12 @@ public class XzdContractProgressSettlementDate extends BaseEntity { /** * 开始时间 */ - private Date beginTime; + private LocalDate beginTime; /** * 结束时间 */ - private Date endTime; + private LocalDate endTime; /** * 周期类型 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 ec873e2a..62857fea 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 @@ -1,12 +1,13 @@ 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.util.Date; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 收款信息对象 xzd_contract_skxx @@ -71,12 +72,12 @@ public class XzdContractSkxx extends BaseEntity { /** * 归还日期 */ - private Date ghrq; + private LocalDate ghrq; /** * 应收日期 */ - private Date ysrq; + private LocalDate ysrq; /** * 累计审批金额 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java index 7bb2dc28..80097c5b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java @@ -2,15 +2,13 @@ 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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同终止对象 xzd_contract_termination @@ -65,9 +63,9 @@ public class XzdContractTermination extends BaseEntity { /** * 终止日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date terminationDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate terminationDate; /** * 甲方单位 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java index 0c223c5c..986fec07 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java @@ -1,17 +1,13 @@ package org.dromara.xzd.domain; -import com.fasterxml.jackson.annotation.JsonFormat; -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 org.springframework.format.annotation.DateTimeFormat; - - -import java.time.LocalDate; -import java.util.Date; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 合同条款-扣款与奖励项对象 xzd_deduction_items @@ -91,16 +87,16 @@ public class XzdDeductionItems extends BaseEntity { /** * 归还时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date returnTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate returnTime; /** * 变更归还时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date changeReturnTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate changeReturnTime; /** * 申请扣除（0：否，1：是） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java index 94f6aed3..ca2fd0f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java @@ -2,15 +2,13 @@ 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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 决算清单(调整)对象 xzd_jsqd_tz @@ -145,9 +143,9 @@ public class XzdJsqdTz extends BaseEntity { /** * 归还期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java index 2bb7b2ca..f12f8e17 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java @@ -2,15 +2,13 @@ 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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 项目信息对象 xzd_project @@ -70,30 +68,30 @@ public class XzdProject extends BaseEntity { /** * 计划开工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedStartDate; /** * 计划竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedCompletionDate; /** * 实际开工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualStartDate; /** * 实际竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualCompletionDate; /** * 管理组织 @@ -178,9 +176,9 @@ public class XzdProject extends BaseEntity { /** * 立项日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date projectEstablishmentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate projectEstablishmentDate; /** * 计划总投资 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectInfo.java index 131c43f4..2c9cc5b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectInfo.java @@ -1,16 +1,13 @@ 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.time.LocalDate; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 客户信息-项目信息8对象 xzd_project_info @@ -80,9 +77,9 @@ public class XzdProjectInfo extends BaseEntity { /** * 项目日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date projectDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate projectDate; /** * 管理组织 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java index 73ca4739..3c4cdb96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; +import java.time.LocalDate; /** * 项目经理推荐及审批对象 xzd_project_manager_approval @@ -52,7 +52,7 @@ public class XzdProjectManagerApproval extends BaseEntity { /** * 日期 */ - private Date recordDate; + private LocalDate recordDate; /** * 项目名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierEvaluation.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierEvaluation.java index 80d3bdc7..3e8cb43c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierEvaluation.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierEvaluation.java @@ -1,14 +1,13 @@ 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.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 供应商评价对象 xzd_supplier_evaluation @@ -58,9 +57,9 @@ public class XzdSupplierEvaluation extends BaseEntity { /** * 评价时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date evaluationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate evaluationTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java index cd77302b..b448c632 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java @@ -2,14 +2,12 @@ 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.util.Date; +import java.time.LocalDate; /** * 供应商信息对象 xzd_supplier_info @@ -129,9 +127,9 @@ public class XzdSupplierInfo extends BaseEntity { /** * 工商变更时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date industrialCommercialChangeTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate industrialCommercialChangeTime; /** * 备注 @@ -156,9 +154,9 @@ public class XzdSupplierInfo extends BaseEntity { /** * 单位成立日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date establishmentDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate establishmentDate; /** * 纳税身份类型（字典） @@ -203,9 +201,9 @@ public class XzdSupplierInfo extends BaseEntity { /** * 注册时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date registrationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate registrationTime; /** * 法人代表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierQualification.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierQualification.java index 32356cbf..cd9e406a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierQualification.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierQualification.java @@ -2,14 +2,12 @@ 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.util.Date; +import java.time.LocalDate; /** * 供应商资质信息对象 xzd_supplier_qualification @@ -44,16 +42,16 @@ public class XzdSupplierQualification extends BaseEntity { /** * 资质起始日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date beginTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate beginTime; /** * 资质到期日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date endTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; /** * 文件路径 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 91b6de69..798ee04a 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 @@ -1,14 +1,15 @@ 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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.time.LocalDate; /** * 供应商信息补充对象 xzd_supplier_supplement @@ -70,7 +71,7 @@ public class XzdSupplierSupplement extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date createDate; + private LocalDate createDate; /** * 审核标志（0：未审核，1：已审核） @@ -86,17 +87,17 @@ public class XzdSupplierSupplement extends BaseEntity { * 冻结开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date freezeStartTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate freezeStartTime; /** * 冻结结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date freezeEndTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate freezeEndTime; /** * 供应商主类型 @@ -121,9 +122,9 @@ public class XzdSupplierSupplement extends BaseEntity { /** * 合格有效期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date qualificationValidity; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate qualificationValidity; /** * 考核小组组长 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java index 67e02ec6..65cf14a6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdWorkcontractCompletionAdjust.java @@ -2,15 +2,13 @@ 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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust @@ -55,9 +53,9 @@ public class XzdWorkcontractCompletionAdjust extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 决算单id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java index a97c4ab3..4c55692e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java @@ -1,15 +1,14 @@ package org.dromara.xzd.domain; -import com.fasterxml.jackson.annotation.JsonFormat; -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 org.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 质保金归还约定对象 xzd_zbjghyd @@ -44,9 +43,9 @@ public class XzdZbjghyd extends BaseEntity { /** * 归还日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghrq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java index a2d352c6..362abc6c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java @@ -1,7 +1,6 @@ package org.dromara.xzd.domain.bo; import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -14,10 +13,9 @@ import org.dromara.xzd.domain.XzdContractAccount; import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -57,9 +55,9 @@ public class XzdContractAccountBo extends BaseEntity { * 单据日期 */ @NotNull(message = "单据日期不能为空", groups = {AddGroup.class, EditGroup.class}) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id @@ -95,9 +93,9 @@ public class XzdContractAccountBo extends BaseEntity { /** * 审定日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date approvedDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate approvedDate; /** * 项目id @@ -142,9 +140,9 @@ public class XzdContractAccountBo extends BaseEntity { /** * 竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date completionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate completionDate; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java index 62ba5418..c14d897d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -11,10 +10,9 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.domain.*; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -54,9 +52,9 @@ public class XzdContractChangeBo extends BaseEntity { * 单据日期 */ @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 所属部门 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java index bee54a81..8c42bc6f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -11,11 +10,9 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.domain.*; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; import java.util.List; /** @@ -79,9 +76,9 @@ public class XzdContractDetailsBo extends BaseEntity { /** * 签订日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date signingDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate signingDate; /** * 客户性质（字典） @@ -131,9 +128,9 @@ public class XzdContractDetailsBo extends BaseEntity { /** * 归档日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingDate; /** * 支付方式（字典） @@ -205,9 +202,9 @@ public class XzdContractDetailsBo extends BaseEntity { /** * 备案时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingTime; /** * 是否固定单价合同 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java index f1abe534..7eb09c1d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -14,10 +13,9 @@ import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.settlement.domain.XzdAlterationInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -69,16 +67,16 @@ public class XzdContractProgressSettlementBo extends BaseEntity { * 结算日期 */ @NotNull(message = "结算日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date settlementDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate settlementDate; /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id @@ -116,17 +114,17 @@ public class XzdContractProgressSettlementBo extends BaseEntity { * 计量开始日期 */ @NotNull(message = "计量开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date meterageDateBegin; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate meterageDateBegin; /** * 计量结束日期 */ @NotNull(message = "计量结束日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date meterageDateEnd; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate meterageDateEnd; /** * 结算单位(客户) @@ -233,13 +231,13 @@ public class XzdContractProgressSettlementBo extends BaseEntity { */ private String fileId; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date beginCreateTime; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate beginCreateTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endCreateTime; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endCreateTime; /** * 印章信息 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementDateBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementDateBo.java index 96c0a80a..2212e847 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementDateBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementDateBo.java @@ -1,12 +1,12 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdContractProgressSettlementDate; -import org.dromara.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdContractProgressSettlementDate; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同进度结算周期业务对象 xzd_contract_progress_settlement_date @@ -32,12 +32,12 @@ public class XzdContractProgressSettlementDateBo extends BaseEntity { /** * 开始时间 */ - private Date beginTime; + private LocalDate beginTime; /** * 结束时间 */ - private Date endTime; + private LocalDate endTime; /** * 周期类型 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractSkxxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractSkxxBo.java index a5f056b0..2bf25182 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractSkxxBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractSkxxBo.java @@ -1,18 +1,17 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdContractSkxx; -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.springframework.format.annotation.DateTimeFormat; +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.XzdContractSkxx; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 收款信息业务对象 xzd_contract_skxx @@ -76,16 +75,16 @@ public class XzdContractSkxxBo extends BaseEntity { /** * 归还日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghrq; /** * 应收日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ysrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ysrq; /** * 累计审批金额 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java index 35e44820..4654a3b7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -10,10 +9,9 @@ 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.XzdContractTermination; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同终止业务对象 xzd_contract_termination @@ -68,9 +66,9 @@ public class XzdContractTerminationBo extends BaseEntity { * 终止日期 */ @NotNull(message = "终止日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date terminationDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate terminationDate; /** * 甲方单位 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java index e5453ba8..3e8907c0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java @@ -1,14 +1,16 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdDeductionItems; -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 java.util.Date; +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.XzdDeductionItems; + +import java.time.LocalDate; /** * 合同条款-扣款与奖励项业务对象 xzd_deduction_items @@ -86,12 +88,12 @@ public class XzdDeductionItemsBo extends BaseEntity { /** * 归还时间 */ - private Date returnTime; + private LocalDate returnTime; /** * 变更归还时间 */ - private Date changeReturnTime; + private LocalDate changeReturnTime; /** * 申请扣除（0：否，1：是） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java index b5b660da..cb412f64 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java @@ -1,15 +1,13 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.domain.XzdJsqdTz; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 决算清单(调整)业务对象 xzd_jsqd_tz @@ -145,9 +143,9 @@ public class XzdJsqdTzBo extends BaseEntity { /** * 归还期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java index 4d3f17bf..4143c0f0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java @@ -1,15 +1,13 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.domain.XzdProject; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -70,30 +68,30 @@ public class XzdProjectBo extends BaseEntity { /** * 计划开工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedStartDate; /** * 计划竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedCompletionDate; /** * 实际开工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualStartDate; /** * 实际竣工日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualCompletionDate; /** * 管理组织 @@ -194,9 +192,9 @@ public class XzdProjectBo extends BaseEntity { /** * 立项日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date projectEstablishmentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate projectEstablishmentDate; /** * 计划总投资 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectInfoBo.java index 6b2baf7d..d4fac9fc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectInfoBo.java @@ -1,19 +1,12 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdProjectInfo; -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 lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdProjectInfo; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; /** * 客户信息-项目信息8业务对象 xzd_project_info @@ -79,9 +72,9 @@ public class XzdProjectInfoBo extends BaseEntity { /** * 项目日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date projectDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate projectDate; /** * 管理组织 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java index c88be4f3..a2f8f28d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.domain.XzdProjectManagerApproval; -import java.util.Date; +import java.time.LocalDate; /** * 项目经理推荐及审批业务对象 xzd_project_manager_approval @@ -53,7 +53,7 @@ public class XzdProjectManagerApprovalBo extends BaseEntity { /** * 日期 */ - private Date recordDate; + private LocalDate recordDate; /** * 项目名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierEvaluationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierEvaluationBo.java index e5a4e90a..df13f2b1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierEvaluationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierEvaluationBo.java @@ -1,16 +1,16 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdSupplierEvaluation; -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 java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; +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.XzdSupplierEvaluation; + +import java.time.LocalDate; /** * 供应商评价业务对象 xzd_supplier_evaluation @@ -62,9 +62,9 @@ public class XzdSupplierEvaluationBo extends BaseEntity { * 评价时间 */ @NotNull(message = "评价时间不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date evaluationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate evaluationTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java index 3c5d40bf..1e5b180f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -10,9 +9,8 @@ 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.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -129,9 +127,9 @@ public class XzdSupplierInfoBo extends BaseEntity { /** * 工商变更时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date industrialCommercialChangeTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate industrialCommercialChangeTime; /** * 备注 @@ -156,9 +154,9 @@ public class XzdSupplierInfoBo extends BaseEntity { /** * 单位成立日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date establishmentDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate establishmentDate; /** * 纳税身份类型（字典） @@ -203,9 +201,9 @@ public class XzdSupplierInfoBo extends BaseEntity { /** * 注册时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date registrationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate registrationTime; /** * 法人代表 @@ -320,16 +318,16 @@ public class XzdSupplierInfoBo extends BaseEntity { /** * 合格有效期开始时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startTime; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startTime; /** * 合格有效期结束时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endTime; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; /** * 审核状态（0：未审核，1：已审核） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierQualificationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierQualificationBo.java index bca4b7f9..d1e05c59 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierQualificationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierQualificationBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -10,9 +9,8 @@ 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.XzdSupplierQualification; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; +import java.time.LocalDate; /** * 供应商资质信息业务对象 xzd_supplier_qualification @@ -47,17 +45,17 @@ public class XzdSupplierQualificationBo extends BaseEntity { * 资质起始日期 */ @NotNull(message = "资质起始日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date beginTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate beginTime; /** * 资质到期日期 */ @NotNull(message = "资质到期日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date endTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; /** * 文件路径 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java index 0584579c..6a44c3bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java @@ -1,16 +1,16 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdSupplierSupplement; -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 java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; +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.XzdSupplierSupplement; + +import java.time.LocalDate; /** * 供应商信息补充业务对象 xzd_supplier_supplement @@ -73,7 +73,7 @@ public class XzdSupplierSupplementBo extends BaseEntity { * 创建日期 */ @NotNull(message = "创建日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date createDate; + private LocalDate createDate; /** * 审核标志（0：未审核，1：已审核） @@ -91,17 +91,17 @@ public class XzdSupplierSupplementBo extends BaseEntity { * 冻结开始时间 */ @NotNull(message = "冻结开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date freezeStartTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate freezeStartTime; /** * 冻结结束时间 */ @NotNull(message = "冻结结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date freezeEndTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate freezeEndTime; /** * 供应商主类型 @@ -131,9 +131,9 @@ public class XzdSupplierSupplementBo extends BaseEntity { * 合格有效期 */ @NotNull(message = "合格有效期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date qualificationValidity; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate qualificationValidity; /** * 考核小组组长 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java index dd46c636..f021d3ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdWorkcontractCompletionAdjustBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -12,10 +11,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -59,10 +57,10 @@ public class XzdWorkcontractCompletionAdjustBo extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date documentDate; + private LocalDate documentDate; /** * 决算单id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java index 92777002..dc6d129d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java @@ -1,17 +1,15 @@ package org.dromara.xzd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdZbjghyd; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdZbjghyd; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 质保金归还约定业务对象 xzd_zbjghyd @@ -43,9 +41,9 @@ public class XzdZbjghydBo extends BaseEntity { /** * 归还日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghrq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java index f2b6ab66..6fed1d51 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; @@ -12,12 +11,11 @@ import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdSettlementRules; import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -61,9 +59,9 @@ public class XzdContractAccountVo implements Serializable { * 单据日期 */ @ExcelProperty(value = "单据日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同编号id @@ -109,9 +107,9 @@ public class XzdContractAccountVo implements Serializable { * 审定日期 */ @ExcelProperty(value = "审定日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date approvedDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate approvedDate; /** * 项目ID @@ -169,9 +167,9 @@ public class XzdContractAccountVo implements Serializable { * 竣工日期 */ @ExcelProperty(value = "竣工日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date completionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate completionDate; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java index b3a5e6b5..a204d081 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -11,12 +10,11 @@ import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.domain.*; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -61,9 +59,9 @@ public class XzdContractChangeVo implements Serializable { * 单据日期 */ @ExcelProperty(value = "单据日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 所属部门 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java index e5f9a4ee..6263a6ba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -11,13 +10,11 @@ import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.domain.*; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; import java.util.List; @@ -81,8 +78,6 @@ public class XzdContractDetailsVo implements Serializable { // @DateTimeFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd") // @ExcelProperty(value = "单据日期") -// private Date documentDate; - private LocalDate documentDate; /** @@ -100,9 +95,9 @@ public class XzdContractDetailsVo implements Serializable { * 签订日期 */ @ExcelProperty(value = "签订日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date signingDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate signingDate; /** * 客户性质（字典） @@ -190,9 +185,9 @@ public class XzdContractDetailsVo implements Serializable { /** * 归档日期 */ - @ExcelProperty(value = "归档日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingDate; +// @ExcelProperty(value = "归档日期") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingDate; /** * 支付方式（字典） @@ -294,9 +289,9 @@ public class XzdContractDetailsVo implements Serializable { * 备案时间 */ @ExcelProperty(value = "备案时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date filingTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate filingTime; /** * 是否固定单价合同 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java index 789ca68e..f658dda8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java @@ -1,15 +1,14 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; - -import org.dromara.xzd.domain.XzdContractProgressSettlementDate; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdContractProgressSettlementDate; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; /** @@ -42,19 +41,19 @@ public class XzdContractProgressSettlementDateVo implements Serializable { * 开始时间 */ @ExcelProperty(value = "开始时间") - private Date beginTime; + private LocalDate beginTime; /** * 结束时间 */ @ExcelProperty(value = "结束时间") - private Date endTime; + private LocalDate endTime; /** * 周期类型 */ @ExcelProperty(value = "周期类型") - private String type; + private LocalDate type; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java index 0733902f..46981d0a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; @@ -12,13 +11,11 @@ import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.settlement.domain.XzdAlterationInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; import java.util.List; @@ -85,9 +82,9 @@ public class XzdContractProgressSettlementVo implements Serializable { * 结算日期 */ @ExcelProperty(value = "结算日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date settlementDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate settlementDate; /** * 单据日期 @@ -145,17 +142,17 @@ public class XzdContractProgressSettlementVo implements Serializable { * 计量开始日期 */ @ExcelProperty(value = "计量开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date meterageDateBegin; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate meterageDateBegin; /** * 计量结束日期 */ @ExcelProperty(value = "计量结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date meterageDateEnd; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate meterageDateEnd; /** * 结算单位(客户) 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 d0bdfb15..aca043a7 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 @@ -1,15 +1,14 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; - -import org.dromara.xzd.domain.XzdContractSkxx; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdContractSkxx; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; /** @@ -83,19 +82,19 @@ public class XzdContractSkxxVo implements Serializable { * 归还日期 */ @ExcelProperty(value = "归还日期") - private Date ghrq; + private LocalDate ghrq; /** * 应收日期 */ @ExcelProperty(value = "应收日期") - private Date ysrq; + private LocalDate ysrq; /** * 累计审批金额 */ @ExcelProperty(value = "累计审批金额") - private Long ljspje; + private LocalDate ljspje; /** * 数据来源 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java index f5962993..54101638 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java @@ -2,18 +2,16 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; 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.XzdContractTermination; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** @@ -74,9 +72,9 @@ public class XzdContractTerminationVo implements Serializable { * 终止日期 */ @ExcelProperty(value = "终止日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date terminationDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate terminationDate; /** * 甲方单位 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java index d92084ba..4c1e014e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java @@ -1,17 +1,16 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; - -import org.dromara.xzd.domain.XzdDeductionItems; 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.XzdDeductionItems; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; /** @@ -104,13 +103,13 @@ public class XzdDeductionItemsVo implements Serializable { * 归还时间 */ @ExcelProperty(value = "归还时间") - private Date returnTime; + private LocalDate returnTime; /** * 变更归还时间 */ @ExcelProperty(value = "变更归还时间") - private Date changeReturnTime; + private LocalDate changeReturnTime; /** * 申请扣除（0：否，1：是） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java index 7fed5c42..5504fe38 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java @@ -2,16 +2,14 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.xzd.domain.XzdJsqdTz; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** @@ -168,9 +166,9 @@ public class XzdJsqdTzVo implements Serializable { /** * 归还期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectInfoVo.java index 70160e4f..50b37882 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectInfoVo.java @@ -1,20 +1,14 @@ package org.dromara.xzd.domain.vo; -import java.time.LocalDate; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdProjectInfo; 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.springframework.format.annotation.DateTimeFormat; +import org.dromara.xzd.domain.XzdProjectInfo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @@ -96,9 +90,9 @@ public class XzdProjectInfoVo implements Serializable { * 项目日期 */ @ExcelProperty(value = "项目日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date projectDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate projectDate; /** * 管理组织 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java index 685303fd..8e506c67 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java @@ -8,7 +8,7 @@ import org.dromara.xzd.domain.XzdProjectManagerApproval; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @@ -58,7 +58,7 @@ public class XzdProjectManagerApprovalVo implements Serializable { * 日期 */ @ExcelProperty(value = "日期") - private Date recordDate; + private LocalDate recordDate; /** * 项目名称 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java index 8234bd14..0f46df8d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java @@ -2,18 +2,16 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.domain.XzdProject; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -85,33 +83,33 @@ public class XzdProjectVo implements Serializable { * 计划开工日期 */ @ExcelProperty(value = "计划开工日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedStartDate; /** * 计划竣工日期 */ @ExcelProperty(value = "计划竣工日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date plannedCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate plannedCompletionDate; /** * 实际开工日期 */ @ExcelProperty(value = "实际开工日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualStartDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualStartDate; /** * 实际竣工日期 */ @ExcelProperty(value = "实际竣工日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date actualCompletionDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate actualCompletionDate; /** * 管理组织 @@ -243,9 +241,9 @@ public class XzdProjectVo implements Serializable { * 立项日期 */ @ExcelProperty(value = "立项日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date projectEstablishmentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate projectEstablishmentDate; /** * 计划总投资 @@ -381,7 +379,7 @@ public class XzdProjectVo implements Serializable { /** * 录入时间 */ - private Date createTime; + private LocalDate createTime; /** * 高度 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierEvaluationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierEvaluationVo.java index 3a713928..07235dbe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierEvaluationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierEvaluationVo.java @@ -1,19 +1,14 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdSupplierEvaluation; 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.springframework.format.annotation.DateTimeFormat; +import org.dromara.xzd.domain.XzdSupplierEvaluation; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @@ -70,9 +65,9 @@ public class XzdSupplierEvaluationVo implements Serializable { * 评价时间 */ @ExcelProperty(value = "评价时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date evaluationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate evaluationTime; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java index 7f77a99f..d481766a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -154,9 +155,9 @@ public class XzdSupplierInfoVo implements Serializable { * 工商变更时间 */ @ExcelProperty(value = "工商变更时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date industrialCommercialChangeTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate industrialCommercialChangeTime; /** * 备注 @@ -189,9 +190,9 @@ public class XzdSupplierInfoVo implements Serializable { * 单位成立日期 */ @ExcelProperty(value = "单位成立日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date establishmentDate; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate establishmentDate; /** * 纳税身份类型（字典） @@ -246,9 +247,9 @@ public class XzdSupplierInfoVo implements Serializable { * 注册时间 */ @ExcelProperty(value = "注册时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date registrationTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate registrationTime; /** * 法人代表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierQualificationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierQualificationVo.java index 374e0fe3..c2fb96b7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierQualificationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierQualificationVo.java @@ -2,15 +2,13 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.xzd.domain.XzdSupplierQualification; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @@ -50,17 +48,17 @@ public class XzdSupplierQualificationVo implements Serializable { * 资质起始日期 */ @ExcelProperty(value = "资质起始日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date beginTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate beginTime; /** * 资质到期日期 */ @ExcelProperty(value = "资质到期日期") - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date endTime; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; /** * 文件路径 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java index f1128251..1fdb8779 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java @@ -1,19 +1,16 @@ package org.dromara.xzd.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdSupplierSupplement; 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.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.xzd.domain.XzdSupplierSupplement; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @@ -82,7 +79,7 @@ public class XzdSupplierSupplementVo implements Serializable { * 创建日期 */ @ExcelProperty(value = "创建日期") - private Date createDate; + private LocalDate createDate; /** * 审核标志（0：未审核，1：已审核） @@ -101,18 +98,18 @@ public class XzdSupplierSupplementVo implements Serializable { /** * 冻结开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "冻结开始时间") - private Date freezeStartTime; + private LocalDate freezeStartTime; /** * 冻结结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "冻结结束时间") - private Date freezeEndTime; + private LocalDate freezeEndTime; /** * 供应商主类型 @@ -141,10 +138,10 @@ public class XzdSupplierSupplementVo implements Serializable { /** * 合格有效期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "合格有效期") - private Date qualificationValidity; + private LocalDate qualificationValidity; /** * 考核小组组长 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java index 3a69bcf0..f523388e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdWorkcontractCompletionAdjustVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -10,12 +9,11 @@ import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -67,9 +65,9 @@ public class XzdWorkcontractCompletionAdjustVo implements Serializable { * 单据日期 */ @ExcelProperty(value = "单据日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 决算单id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java index dc3d8971..04fd7a9f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java @@ -1,17 +1,15 @@ package org.dromara.xzd.domain.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.domain.XzdZbjghyd; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.xzd.domain.XzdZbjghyd; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** @@ -49,9 +47,9 @@ public class XzdZbjghydVo implements Serializable { /** * 归还日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date ghrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate ghrq; /** * 归还比例 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/XzdContractPayment.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/XzdContractPayment.java index dd1fa0f3..f75bfa78 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/XzdContractPayment.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/XzdContractPayment.java @@ -2,15 +2,13 @@ package org.dromara.xzd.skyfk.cbhtsc.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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 承包合同收款对象 xzd_contract_payment @@ -55,9 +53,9 @@ public class XzdContractPayment extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id @@ -77,9 +75,9 @@ public class XzdContractPayment extends BaseEntity { /** * 实际收款日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date paymentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentDate; /** * 项目id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/bo/XzdContractPaymentBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/bo/XzdContractPaymentBo.java index bde23d0f..ff7348c7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/bo/XzdContractPaymentBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/bo/XzdContractPaymentBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.skyfk.cbhtsc.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -12,10 +11,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.domain.bo.XzdContractSkxxBo; import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo; import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -58,10 +56,10 @@ public class XzdContractPaymentBo extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date documentDate; + private LocalDate documentDate; /** * 合同id @@ -85,9 +83,9 @@ public class XzdContractPaymentBo extends BaseEntity { * 实际收款日期 */ @NotNull(message = "实际收款日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date paymentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentDate; /** * 项目id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java index b77deb29..751e33e1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.skyfk.cbhtsc.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; @@ -11,12 +10,11 @@ import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractSkxxVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo; import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -65,10 +63,10 @@ public class XzdContractPaymentVo implements Serializable { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") @ExcelProperty(value = "单据日期") - private Date documentDate; + private LocalDate documentDate; /** * 合同id @@ -97,9 +95,9 @@ public class XzdContractPaymentVo implements Serializable { * 实际收款日期 */ @ExcelProperty(value = "实际收款日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date paymentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentDate; /** * 项目id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java index 7528a6ce..606f2505 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java @@ -2,14 +2,12 @@ package org.dromara.xzd.skyfk.fbhtfk.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.util.Date; +import java.time.LocalDate; /** * 收款与付款-分包合同付款对象 xzd_skyfk_fbhtfk @@ -54,9 +52,9 @@ public class XzdSkyfkFbhtfk extends BaseEntity { /** * 单据日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java index 096a3b39..35eb38be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.skyfk.fbhtfk.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -12,9 +11,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFapiao; import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFukuan; import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -59,9 +57,9 @@ public class XzdSkyfkFbhtfkBo extends BaseEntity { * 单据日期 */ @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java index 60c9fc82..5fd6a152 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java @@ -2,7 +2,6 @@ package org.dromara.xzd.skyfk.fbhtfk.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; @@ -11,11 +10,10 @@ import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcont import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFukuanVo; import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -66,9 +64,9 @@ public class XzdSkyfkFbhtfkVo implements Serializable { * 单据日期 */ @ExcelProperty(value = "单据日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date documentDate; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate documentDate; /** * 合同id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/XzdSpykpKpsq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/XzdSpykpKpsq.java index 235bd1dd..1485ebd7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/XzdSpykpKpsq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/XzdSpykpKpsq.java @@ -2,15 +2,13 @@ package org.dromara.xzd.spykp.kpsq.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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 收票与开票-开票申请对象 xzd_spykp_kpsq @@ -55,9 +53,9 @@ public class XzdSpykpKpsq extends BaseEntity { /** * 申请日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date sqrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate sqrq; /** * 申请人 @@ -302,16 +300,16 @@ public class XzdSpykpKpsq extends BaseEntity { /** * 租赁开始日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zlksrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zlksrq; /** * 租赁结束日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zljsrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zljsrq; /** * 红冲原因 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/bo/XzdSpykpKpsqBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/bo/XzdSpykpKpsqBo.java index 6a247e6d..840de16d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/bo/XzdSpykpKpsqBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/bo/XzdSpykpKpsqBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.spykp.kpsq.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -11,10 +10,9 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; /** @@ -56,9 +54,9 @@ public class XzdSpykpKpsqBo extends BaseEntity { /** * 申请日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date sqrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate sqrq; /** * 申请人 @@ -305,16 +303,16 @@ public class XzdSpykpKpsqBo extends BaseEntity { /** * 租赁开始日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zlksrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zlksrq; /** * 租赁结束日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zljsrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zljsrq; /** * 红冲原因 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/vo/XzdSpykpKpsqVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/vo/XzdSpykpKpsqVo.java index afcf414c..1f54fb8d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/vo/XzdSpykpKpsqVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/vo/XzdSpykpKpsqVo.java @@ -2,17 +2,15 @@ package org.dromara.xzd.spykp.kpsq.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -63,9 +61,9 @@ public class XzdSpykpKpsqVo implements Serializable { * 申请日期 */ @ExcelProperty(value = "申请日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date sqrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate sqrq; /** * 申请人 @@ -359,17 +357,17 @@ public class XzdSpykpKpsqVo implements Serializable { * 租赁开始日期 */ @ExcelProperty(value = "租赁开始日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zlksrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zlksrq; /** * 租赁结束日期 */ @ExcelProperty(value = "租赁结束日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date zljsrq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate zljsrq; /** * 红冲原因 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java index 1a0f0261..425a3077 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java @@ -2,15 +2,13 @@ package org.dromara.xzd.spykp.sjsqd.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.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 收据申请单对象 xzd_spykp_sjsqd @@ -65,9 +63,9 @@ public class XzdSpykpSjsqd extends BaseEntity { /** * 日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date rq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate rq; /** * 申请人id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java index 5867d4d5..90ed8ad8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java @@ -1,6 +1,5 @@ package org.dromara.xzd.spykp.sjsqd.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -10,10 +9,9 @@ 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.spykp.sjsqd.domain.XzdSpykpSjsqd; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 收据申请单业务对象 xzd_spykp_sjsqd @@ -70,9 +68,9 @@ public class XzdSpykpSjsqdBo extends BaseEntity { /** * 日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date rq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate rq; /** * 申请人id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java index 881b5149..d3ad0c8f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java @@ -2,18 +2,16 @@ package org.dromara.xzd.spykp.sjsqd.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** @@ -84,9 +82,9 @@ public class XzdSpykpSjsqdVo implements Serializable { * 日期 */ @ExcelProperty(value = "日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date rq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate rq; /** * 申请人id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java index 386203b4..8b6fbbba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java @@ -1,16 +1,14 @@ package org.dromara.xzd.spykp.spdj.domain; -import com.fasterxml.jackson.annotation.JsonFormat; -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 org.springframework.format.annotation.DateTimeFormat; - -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_spykp_spdj @@ -75,9 +73,9 @@ public class XzdSpykpSpdj extends BaseEntity { /** * 开票日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date kprq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate kprq; /** * 公司税号 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java index 9fef79c5..33bb71f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java @@ -1,17 +1,15 @@ package org.dromara.xzd.spykp.spdj.domain.bo; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; /** * 收票登记业务对象 xzd_spykp_spdj @@ -73,9 +71,9 @@ public class XzdSpykpSpdjBo extends BaseEntity { /** * 开票日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date kprq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate kprq; /** * 公司税号 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java index 017b0e15..b104645f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java @@ -1,18 +1,15 @@ package org.dromara.xzd.spykp.spdj.domain.vo; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; +import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; /** @@ -102,9 +99,9 @@ public class XzdSpykpSpdjVo implements Serializable { * 开票日期 */ @ExcelProperty(value = "开票日期") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date kprq; +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate kprq; /** * 公司税号