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

10-29-LocalDate修改

Browse Source
This commit is contained in:
青云
2025-10-29 19:17:09 +08:00
parent 9b30a7bcec
commit c2a06a729c
69 changed files with 522 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同竣工结算对象 xzd_contract_account * 承包合同竣工结算对象 xzd_contract_account
@ -50,9 +48,9 @@ public class XzdContractAccount extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -87,9 +85,9 @@ public class XzdContractAccount extends BaseEntity {
/** /**
* 审定日期 * 审定日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate; private LocalDate approvedDate;
/** /**
* 项目id * 项目id
@ -134,9 +132,9 @@ public class XzdContractAccount extends BaseEntity {
/** /**
* 竣工日期 * 竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate; private LocalDate completionDate;
/** /**
* 备注 * 备注

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

@ -2,14 +2,12 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同变更对象 xzd_contract_change * 承包合同变更对象 xzd_contract_change
@ -49,9 +47,9 @@ public class XzdContractChange extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 所属部门 * 所属部门

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

@ -2,16 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
/** /**
* 承包合同信息对象 xzd_contract_details * 承包合同信息对象 xzd_contract_details
@ -73,9 +70,9 @@ public class XzdContractDetails extends BaseEntity {
/** /**
* 签订日期 * 签订日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signingDate; private LocalDate signingDate;
/** /**
* 客户性质（字典） * 客户性质（字典）
@ -120,9 +117,9 @@ public class XzdContractDetails extends BaseEntity {
/** /**
* 归档日期 * 归档日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingDate; private LocalDate filingDate;
/** /**
* 支付方式（字典） * 支付方式（字典）
@ -192,9 +189,9 @@ public class XzdContractDetails extends BaseEntity {
/** /**
* 备案时间 * 备案时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingTime; private LocalDate filingTime;
/** /**
* 是否固定单价合同 * 是否固定单价合同

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

@ -2,14 +2,12 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同进度结算对象 xzd_contract_progress_settlement * 承包合同进度结算对象 xzd_contract_progress_settlement
@ -59,14 +57,14 @@ public class XzdContractProgressSettlement extends BaseEntity {
/** /**
* 结算日期 * 结算日期
*/ */
private Date settlementDate; private LocalDate settlementDate;
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -101,12 +99,12 @@ public class XzdContractProgressSettlement extends BaseEntity {
/** /**
* 计量开始日期 * 计量开始日期
*/ */
private Date meterageDateBegin; private LocalDate meterageDateBegin;
/** /**
* 计量结束日期 * 计量结束日期
*/ */
private Date meterageDateEnd; private LocalDate meterageDateEnd;
/** /**
* 结算单位(客户) * 结算单位(客户)

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

@ -1,12 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 承包合同进度结算周期对象 xzd_contract_progress_settlement_date * 承包合同进度结算周期对象 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;
/** /**
* 周期类型 * 周期类型

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

@ -1,12 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 收款信息对象 xzd_contract_skxx * 收款信息对象 xzd_contract_skxx
@ -71,12 +72,12 @@ public class XzdContractSkxx extends BaseEntity {
/** /**
* 归还日期 * 归还日期
*/ */
private Date ghrq; private LocalDate ghrq;
/** /**
* 应收日期 * 应收日期
*/ */
private Date ysrq; private LocalDate ysrq;
/** /**
* 累计审批金额 * 累计审批金额

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同终止对象 xzd_contract_termination * 承包合同终止对象 xzd_contract_termination
@ -65,9 +63,9 @@ public class XzdContractTermination extends BaseEntity {
/** /**
* 终止日期 * 终止日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate; private LocalDate terminationDate;
/** /**
* 甲方单位 * 甲方单位

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

@ -1,17 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableId;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.time.LocalDate;
import java.util.Date;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 合同条款-扣款与奖励项对象 xzd_deduction_items * 合同条款-扣款与奖励项对象 xzd_deduction_items
@ -91,16 +87,16 @@ public class XzdDeductionItems extends BaseEntity {
/** /**
* 归还时间 * 归还时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date returnTime; private LocalDate returnTime;
/** /**
* 变更归还时间 * 变更归还时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date changeReturnTime; private LocalDate changeReturnTime;
/** /**
* 申请扣除（0：否，1：是） * 申请扣除（0：否，1：是）

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 决算清单(调整)对象 xzd_jsqd_tz * 决算清单(调整)对象 xzd_jsqd_tz
@ -145,9 +143,9 @@ public class XzdJsqdTz extends BaseEntity {
/** /**
* 归还期 * 归还期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghq; private LocalDate ghq;
/** /**
* 归还比例 * 归还比例

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 项目信息对象 xzd_project * 项目信息对象 xzd_project
@ -70,30 +68,30 @@ public class XzdProject extends BaseEntity {
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private LocalDate plannedStartDate;
/** /**
* 计划竣工日期 * 计划竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private LocalDate plannedCompletionDate;
/** /**
* 实际开工日期 * 实际开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private LocalDate actualStartDate;
/** /**
* 实际竣工日期 * 实际竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private LocalDate actualCompletionDate;
/** /**
* 管理组织 * 管理组织
@ -178,9 +176,9 @@ public class XzdProject extends BaseEntity {
/** /**
* 立项日期 * 立项日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private LocalDate projectEstablishmentDate;
/** /**
* 计划总投资 * 计划总投资

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

@ -1,16 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 客户信息-项目信息8对象 xzd_project_info * 客户信息-项目信息8对象 xzd_project_info
@ -80,9 +77,9 @@ public class XzdProjectInfo extends BaseEntity {
/** /**
* 项目日期 * 项目日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate; private LocalDate projectDate;
/** /**
* 管理组织 * 管理组织

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

@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 项目经理推荐及审批对象 xzd_project_manager_approval * 项目经理推荐及审批对象 xzd_project_manager_approval
@ -52,7 +52,7 @@ public class XzdProjectManagerApproval extends BaseEntity {
/** /**
* 日期 * 日期
*/ */
private Date recordDate; private LocalDate recordDate;
/** /**
* 项目名称 * 项目名称

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

@ -1,14 +1,13 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 供应商评价对象 xzd_supplier_evaluation * 供应商评价对象 xzd_supplier_evaluation
@ -58,9 +57,9 @@ public class XzdSupplierEvaluation extends BaseEntity {
/** /**
* 评价时间 * 评价时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime; private LocalDate evaluationTime;
} }

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

@ -2,14 +2,12 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 供应商信息对象 xzd_supplier_info * 供应商信息对象 xzd_supplier_info
@ -129,9 +127,9 @@ public class XzdSupplierInfo extends BaseEntity {
/** /**
* 工商变更时间 * 工商变更时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date industrialCommercialChangeTime; private LocalDate industrialCommercialChangeTime;
/** /**
* 备注 * 备注
@ -156,9 +154,9 @@ public class XzdSupplierInfo extends BaseEntity {
/** /**
* 单位成立日期 * 单位成立日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishmentDate; private LocalDate establishmentDate;
/** /**
* 纳税身份类型（字典） * 纳税身份类型（字典）
@ -203,9 +201,9 @@ public class XzdSupplierInfo extends BaseEntity {
/** /**
* 注册时间 * 注册时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date registrationTime; private LocalDate registrationTime;
/** /**
* 法人代表 * 法人代表

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

@ -2,14 +2,12 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 供应商资质信息对象 xzd_supplier_qualification * 供应商资质信息对象 xzd_supplier_qualification
@ -44,16 +42,16 @@ public class XzdSupplierQualification extends BaseEntity {
/** /**
* 资质起始日期 * 资质起始日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private LocalDate beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private LocalDate endTime;
/** /**
* 文件路径 * 文件路径

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

@ -1,14 +1,15 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDate;
/** /**
* 供应商信息补充对象 xzd_supplier_supplement * 供应商信息补充对象 xzd_supplier_supplement
@ -70,7 +71,7 @@ public class XzdSupplierSupplement extends BaseEntity {
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createDate; private LocalDate createDate;
/** /**
* 审核标志（0：未审核，1：已审核） * 审核标志（0：未审核，1：已审核）
@ -86,17 +87,17 @@ public class XzdSupplierSupplement extends BaseEntity {
* 冻结开始时间 * 冻结开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeStartTime; private LocalDate freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeEndTime; private LocalDate freezeEndTime;
/** /**
* 供应商主类型 * 供应商主类型
@ -121,9 +122,9 @@ public class XzdSupplierSupplement extends BaseEntity {
/** /**
* 合格有效期 * 合格有效期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date qualificationValidity; private LocalDate qualificationValidity;
/** /**
* 考核小组组长 * 考核小组组长

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust * 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust
@ -55,9 +53,9 @@ public class XzdWorkcontractCompletionAdjust extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 决算单id * 决算单id

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

@ -1,15 +1,14 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableId;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 质保金归还约定对象 xzd_zbjghyd * 质保金归还约定对象 xzd_zbjghyd
@ -44,9 +43,9 @@ public class XzdZbjghyd extends BaseEntity {
/** /**
* 归还日期 * 归还日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghrq; private LocalDate ghrq;
/** /**
* 归还比例 * 归还比例

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

@ -1,7 +1,6 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.XzdJsqdTz;
import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.domain.XzdZbjghyd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -57,9 +55,9 @@ public class XzdContractAccountBo extends BaseEntity {
* 单据日期 * 单据日期
*/ */
@NotNull(message = "单据日期不能为空", groups = {AddGroup.class, EditGroup.class}) @NotNull(message = "单据日期不能为空", groups = {AddGroup.class, EditGroup.class})
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -95,9 +93,9 @@ public class XzdContractAccountBo extends BaseEntity {
/** /**
* 审定日期 * 审定日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate; private LocalDate approvedDate;
/** /**
* 项目id * 项目id
@ -142,9 +140,9 @@ public class XzdContractAccountBo extends BaseEntity {
/** /**
* 竣工日期 * 竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate; private LocalDate completionDate;
/** /**
* 备注 * 备注

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -54,9 +52,9 @@ public class XzdContractChangeBo extends BaseEntity {
* 单据日期 * 单据日期
*/ */
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 所属部门 * 所属部门

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -79,9 +76,9 @@ public class XzdContractDetailsBo extends BaseEntity {
/** /**
* 签订日期 * 签订日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signingDate; private LocalDate signingDate;
/** /**
* 客户性质（字典） * 客户性质（字典）
@ -131,9 +128,9 @@ public class XzdContractDetailsBo extends BaseEntity {
/** /**
* 归档日期 * 归档日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingDate; private LocalDate filingDate;
/** /**
* 支付方式（字典） * 支付方式（字典）
@ -205,9 +202,9 @@ public class XzdContractDetailsBo extends BaseEntity {
/** /**
* 备案时间 * 备案时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingTime; private LocalDate filingTime;
/** /**
* 是否固定单价合同 * 是否固定单价合同

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -69,16 +67,16 @@ public class XzdContractProgressSettlementBo extends BaseEntity {
* 结算日期 * 结算日期
*/ */
@NotNull(message = "结算日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "结算日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date settlementDate; private LocalDate settlementDate;
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -116,17 +114,17 @@ public class XzdContractProgressSettlementBo extends BaseEntity {
* 计量开始日期 * 计量开始日期
*/ */
@NotNull(message = "计量开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "计量开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date meterageDateBegin; private LocalDate meterageDateBegin;
/** /**
* 计量结束日期 * 计量结束日期
*/ */
@NotNull(message = "计量结束日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "计量结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date meterageDateEnd; private LocalDate meterageDateEnd;
/** /**
* 结算单位(客户) * 结算单位(客户)
@ -233,13 +231,13 @@ public class XzdContractProgressSettlementBo extends BaseEntity {
*/ */
private String fileId; private String fileId;
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date beginCreateTime; private LocalDate beginCreateTime;
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date endCreateTime; private LocalDate endCreateTime;
/** /**
* 印章信息 * 印章信息

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

@ -1,12 +1,12 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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 * 承包合同进度结算周期业务对象 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;
/** /**
* 周期类型 * 周期类型

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

@ -1,18 +1,17 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
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.XzdContractSkxx;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收款信息业务对象 xzd_contract_skxx * 收款信息业务对象 xzd_contract_skxx
@ -76,16 +75,16 @@ public class XzdContractSkxxBo extends BaseEntity {
/** /**
* 归还日期 * 归还日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghrq; private LocalDate ghrq;
/** /**
* 应收日期 * 应收日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ysrq; private LocalDate ysrq;
/** /**
* 累计审批金额 * 累计审批金额

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdContractTermination; import org.dromara.xzd.domain.XzdContractTermination;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同终止业务对象 xzd_contract_termination * 承包合同终止业务对象 xzd_contract_termination
@ -68,9 +66,9 @@ public class XzdContractTerminationBo extends BaseEntity {
* 终止日期 * 终止日期
*/ */
@NotNull(message = "终止日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "终止日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate; private LocalDate terminationDate;
/** /**
* 甲方单位 * 甲方单位

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

@ -1,14 +1,16 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import java.util.Date; 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 * 合同条款-扣款与奖励项业务对象 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：是） * 申请扣除（0：否，1：是）

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

@ -1,15 +1,13 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdJsqdTz;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 决算清单(调整)业务对象 xzd_jsqd_tz * 决算清单(调整)业务对象 xzd_jsqd_tz
@ -145,9 +143,9 @@ public class XzdJsqdTzBo extends BaseEntity {
/** /**
* 归还期 * 归还期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghq; private LocalDate ghq;
/** /**
* 归还比例 * 归还比例

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

@ -1,15 +1,13 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdProject; import org.dromara.xzd.domain.XzdProject;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -70,30 +68,30 @@ public class XzdProjectBo extends BaseEntity {
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private LocalDate plannedStartDate;
/** /**
* 计划竣工日期 * 计划竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private LocalDate plannedCompletionDate;
/** /**
* 实际开工日期 * 实际开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private LocalDate actualStartDate;
/** /**
* 实际竣工日期 * 实际竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private LocalDate actualCompletionDate;
/** /**
* 管理组织 * 管理组织
@ -194,9 +192,9 @@ public class XzdProjectBo extends BaseEntity {
/** /**
* 立项日期 * 立项日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private LocalDate projectEstablishmentDate;
/** /**
* 计划总投资 * 计划总投资

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

@ -1,19 +1,12 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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.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 * 客户信息-项目信息8业务对象 xzd_project_info
@ -79,9 +72,9 @@ public class XzdProjectInfoBo extends BaseEntity {
/** /**
* 项目日期 * 项目日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate; private LocalDate projectDate;
/** /**
* 管理组织 * 管理组织

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

@ -10,7 +10,7 @@ import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdProjectManagerApproval; import org.dromara.xzd.domain.XzdProjectManagerApproval;
import java.util.Date; import java.time.LocalDate;
/** /**
* 项目经理推荐及审批业务对象 xzd_project_manager_approval * 项目经理推荐及审批业务对象 xzd_project_manager_approval
@ -53,7 +53,7 @@ public class XzdProjectManagerApprovalBo extends BaseEntity {
/** /**
* 日期 * 日期
*/ */
private Date recordDate; private LocalDate recordDate;
/** /**
* 项目名称 * 项目名称

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

@ -1,16 +1,16 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import java.util.Date; import org.dromara.common.core.validate.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.domain.XzdSupplierEvaluation;
import java.time.LocalDate;
/** /**
* 供应商评价业务对象 xzd_supplier_evaluation * 供应商评价业务对象 xzd_supplier_evaluation
@ -62,9 +62,9 @@ public class XzdSupplierEvaluationBo extends BaseEntity {
* 评价时间 * 评价时间
*/ */
@NotNull(message = "评价时间不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "评价时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime; private LocalDate evaluationTime;
} }

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -129,9 +127,9 @@ public class XzdSupplierInfoBo extends BaseEntity {
/** /**
* 工商变更时间 * 工商变更时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date industrialCommercialChangeTime; private LocalDate industrialCommercialChangeTime;
/** /**
* 备注 * 备注
@ -156,9 +154,9 @@ public class XzdSupplierInfoBo extends BaseEntity {
/** /**
* 单位成立日期 * 单位成立日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishmentDate; private LocalDate establishmentDate;
/** /**
* 纳税身份类型（字典） * 纳税身份类型（字典）
@ -203,9 +201,9 @@ public class XzdSupplierInfoBo extends BaseEntity {
/** /**
* 注册时间 * 注册时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date registrationTime; private LocalDate registrationTime;
/** /**
* 法人代表 * 法人代表
@ -320,16 +318,16 @@ public class XzdSupplierInfoBo extends BaseEntity {
/** /**
* 合格有效期开始时间 * 合格有效期开始时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime; private LocalDate startTime;
/** /**
* 合格有效期结束时间 * 合格有效期结束时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime; private LocalDate endTime;
/** /**
* 审核状态（0：未审核，1：已审核） * 审核状态（0：未审核，1：已审核）

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdSupplierQualification; import org.dromara.xzd.domain.XzdSupplierQualification;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.time.LocalDate;
/** /**
* 供应商资质信息业务对象 xzd_supplier_qualification * 供应商资质信息业务对象 xzd_supplier_qualification
@ -47,17 +45,17 @@ public class XzdSupplierQualificationBo extends BaseEntity {
* 资质起始日期 * 资质起始日期
*/ */
@NotNull(message = "资质起始日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "资质起始日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private LocalDate beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@NotNull(message = "资质到期日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "资质到期日期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private LocalDate endTime;
/** /**
* 文件路径 * 文件路径

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

@ -1,16 +1,16 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import java.util.Date; import org.dromara.common.core.validate.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.domain.XzdSupplierSupplement;
import java.time.LocalDate;
/** /**
* 供应商信息补充业务对象 xzd_supplier_supplement * 供应商信息补充业务对象 xzd_supplier_supplement
@ -73,7 +73,7 @@ public class XzdSupplierSupplementBo extends BaseEntity {
* 创建日期 * 创建日期
*/ */
@NotNull(message = "创建日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "创建日期不能为空", groups = { AddGroup.class, EditGroup.class })
private Date createDate; private LocalDate createDate;
/** /**
* 审核标志（0：未审核，1：已审核） * 审核标志（0：未审核，1：已审核）
@ -91,17 +91,17 @@ public class XzdSupplierSupplementBo extends BaseEntity {
* 冻结开始时间 * 冻结开始时间
*/ */
@NotNull(message = "冻结开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "冻结开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeStartTime; private LocalDate freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@NotNull(message = "冻结结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "冻结结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeEndTime; private LocalDate freezeEndTime;
/** /**
* 供应商主类型 * 供应商主类型
@ -131,9 +131,9 @@ public class XzdSupplierSupplementBo extends BaseEntity {
* 合格有效期 * 合格有效期
*/ */
@NotNull(message = "合格有效期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "合格有效期不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date qualificationValidity; private LocalDate qualificationValidity;
/** /**
* 考核小组组长 * 考核小组组长

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

@ -1,6 +1,5 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.XzdJsqdTz;
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -59,10 +57,10 @@ public class XzdWorkcontractCompletionAdjustBo extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
private Date documentDate; private LocalDate documentDate;
/** /**
* 决算单id * 决算单id

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

@ -1,17 +1,15 @@
package org.dromara.xzd.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.EditGroup;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdZbjghyd;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 质保金归还约定业务对象 xzd_zbjghyd * 质保金归还约定业务对象 xzd_zbjghyd
@ -43,9 +41,9 @@ public class XzdZbjghydBo extends BaseEntity {
/** /**
* 归还日期 * 归还日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghrq; private LocalDate ghrq;
/** /**
* 归还比例 * 归还比例

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

@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; 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.XzdSettlementRules;
import org.dromara.xzd.domain.XzdZbjghyd; import org.dromara.xzd.domain.XzdZbjghyd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -61,9 +59,9 @@ public class XzdContractAccountVo implements Serializable {
* 单据日期 * 单据日期
*/ */
@ExcelProperty(value = "单据日期") @ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同编号id * 合同编号id
@ -109,9 +107,9 @@ public class XzdContractAccountVo implements Serializable {
* 审定日期 * 审定日期
*/ */
@ExcelProperty(value = "审定日期") @ExcelProperty(value = "审定日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate; private LocalDate approvedDate;
/** /**
* 项目ID * 项目ID
@ -169,9 +167,9 @@ public class XzdContractAccountVo implements Serializable {
* 竣工日期 * 竣工日期
*/ */
@ExcelProperty(value = "竣工日期") @ExcelProperty(value = "竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate; private LocalDate completionDate;
/** /**
* 备注 * 备注

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

@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; 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.common.translation.constant.TransConstant;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -61,9 +59,9 @@ public class XzdContractChangeVo implements Serializable {
* 单据日期 * 单据日期
*/ */
@ExcelProperty(value = "单据日期") @ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 所属部门 * 所属部门

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

@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; 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.common.translation.constant.TransConstant;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
import java.util.List; import java.util.List;
@ -81,8 +78,6 @@ public class XzdContractDetailsVo implements Serializable {
// @DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
// @ExcelProperty(value = "单据日期") // @ExcelProperty(value = "单据日期")
// private Date documentDate;
private LocalDate documentDate; private LocalDate documentDate;
/** /**
@ -100,9 +95,9 @@ public class XzdContractDetailsVo implements Serializable {
* 签订日期 * 签订日期
*/ */
@ExcelProperty(value = "签订日期") @ExcelProperty(value = "签订日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signingDate; private LocalDate signingDate;
/** /**
* 客户性质（字典） * 客户性质（字典）
@ -190,9 +185,9 @@ public class XzdContractDetailsVo implements Serializable {
/** /**
* 归档日期 * 归档日期
*/ */
@ExcelProperty(value = "归档日期") // @ExcelProperty(value = "归档日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingDate; private LocalDate filingDate;
/** /**
* 支付方式（字典） * 支付方式（字典）
@ -294,9 +289,9 @@ public class XzdContractDetailsVo implements Serializable {
* 备案时间 * 备案时间
*/ */
@ExcelProperty(value = "备案时间") @ExcelProperty(value = "备案时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date filingTime; private LocalDate filingTime;
/** /**
* 是否固定单价合同 * 是否固定单价合同

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

@ -1,15 +1,14 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
/** /**
@ -42,19 +41,19 @@ public class XzdContractProgressSettlementDateVo implements Serializable {
* 开始时间 * 开始时间
*/ */
@ExcelProperty(value = "开始时间") @ExcelProperty(value = "开始时间")
private Date beginTime; private LocalDate beginTime;
/** /**
* 结束时间 * 结束时间
*/ */
@ExcelProperty(value = "结束时间") @ExcelProperty(value = "结束时间")
private Date endTime; private LocalDate endTime;
/** /**
* 周期类型 * 周期类型
*/ */
@ExcelProperty(value = "周期类型") @ExcelProperty(value = "周期类型")
private String type; private LocalDate type;
} }

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

@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; 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.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory; import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
import java.util.List; import java.util.List;
@ -85,9 +82,9 @@ public class XzdContractProgressSettlementVo implements Serializable {
* 结算日期 * 结算日期
*/ */
@ExcelProperty(value = "结算日期") @ExcelProperty(value = "结算日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date settlementDate; private LocalDate settlementDate;
/** /**
* 单据日期 * 单据日期
@ -145,17 +142,17 @@ public class XzdContractProgressSettlementVo implements Serializable {
* 计量开始日期 * 计量开始日期
*/ */
@ExcelProperty(value = "计量开始日期") @ExcelProperty(value = "计量开始日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date meterageDateBegin; private LocalDate meterageDateBegin;
/** /**
* 计量结束日期 * 计量结束日期
*/ */
@ExcelProperty(value = "计量结束日期") @ExcelProperty(value = "计量结束日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date meterageDateEnd; private LocalDate meterageDateEnd;
/** /**
* 结算单位(客户) * 结算单位(客户)

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

@ -1,15 +1,14 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.XzdContractSkxx;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
/** /**
@ -83,19 +82,19 @@ public class XzdContractSkxxVo implements Serializable {
* 归还日期 * 归还日期
*/ */
@ExcelProperty(value = "归还日期") @ExcelProperty(value = "归还日期")
private Date ghrq; private LocalDate ghrq;
/** /**
* 应收日期 * 应收日期
*/ */
@ExcelProperty(value = "应收日期") @ExcelProperty(value = "应收日期")
private Date ysrq; private LocalDate ysrq;
/** /**
* 累计审批金额 * 累计审批金额
*/ */
@ExcelProperty(value = "累计审批金额") @ExcelProperty(value = "累计审批金额")
private Long ljspje; private LocalDate ljspje;
/** /**
* 数据来源 * 数据来源

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

@ -2,18 +2,16 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.xzd.domain.XzdContractTermination; import org.dromara.xzd.domain.XzdContractTermination;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
@ -74,9 +72,9 @@ public class XzdContractTerminationVo implements Serializable {
* 终止日期 * 终止日期
*/ */
@ExcelProperty(value = "终止日期") @ExcelProperty(value = "终止日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate; private LocalDate terminationDate;
/** /**
* 甲方单位 * 甲方单位

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

@ -1,17 +1,16 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
/** /**
@ -104,13 +103,13 @@ public class XzdDeductionItemsVo implements Serializable {
* 归还时间 * 归还时间
*/ */
@ExcelProperty(value = "归还时间") @ExcelProperty(value = "归还时间")
private Date returnTime; private LocalDate returnTime;
/** /**
* 变更归还时间 * 变更归还时间
*/ */
@ExcelProperty(value = "变更归还时间") @ExcelProperty(value = "变更归还时间")
private Date changeReturnTime; private LocalDate changeReturnTime;
/** /**
* 申请扣除（0：否，1：是） * 申请扣除（0：否，1：是）

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

@ -2,16 +2,14 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.XzdJsqdTz; import org.dromara.xzd.domain.XzdJsqdTz;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; 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") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghq; private LocalDate ghq;
/** /**
* 归还比例 * 归还比例

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

@ -1,20 +1,14 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.domain.XzdProjectInfo;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
@ -96,9 +90,9 @@ public class XzdProjectInfoVo implements Serializable {
* 项目日期 * 项目日期
*/ */
@ExcelProperty(value = "项目日期") @ExcelProperty(value = "项目日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate; private LocalDate projectDate;
/** /**
* 管理组织 * 管理组织

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

@ -8,7 +8,7 @@ import org.dromara.xzd.domain.XzdProjectManagerApproval;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
@ -58,7 +58,7 @@ public class XzdProjectManagerApprovalVo implements Serializable {
* 日期 * 日期
*/ */
@ExcelProperty(value = "日期") @ExcelProperty(value = "日期")
private Date recordDate; private LocalDate recordDate;
/** /**
* 项目名称 * 项目名称

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

@ -2,18 +2,16 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.domain.XzdProject; import org.dromara.xzd.domain.XzdProject;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -85,33 +83,33 @@ public class XzdProjectVo implements Serializable {
* 计划开工日期 * 计划开工日期
*/ */
@ExcelProperty(value = "计划开工日期") @ExcelProperty(value = "计划开工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private LocalDate plannedStartDate;
/** /**
* 计划竣工日期 * 计划竣工日期
*/ */
@ExcelProperty(value = "计划竣工日期") @ExcelProperty(value = "计划竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private LocalDate plannedCompletionDate;
/** /**
* 实际开工日期 * 实际开工日期
*/ */
@ExcelProperty(value = "实际开工日期") @ExcelProperty(value = "实际开工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private LocalDate actualStartDate;
/** /**
* 实际竣工日期 * 实际竣工日期
*/ */
@ExcelProperty(value = "实际竣工日期") @ExcelProperty(value = "实际竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private LocalDate actualCompletionDate;
/** /**
* 管理组织 * 管理组织
@ -243,9 +241,9 @@ public class XzdProjectVo implements Serializable {
* 立项日期 * 立项日期
*/ */
@ExcelProperty(value = "立项日期") @ExcelProperty(value = "立项日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private LocalDate projectEstablishmentDate;
/** /**
* 计划总投资 * 计划总投资
@ -381,7 +379,7 @@ public class XzdProjectVo implements Serializable {
/** /**
* 录入时间 * 录入时间
*/ */
private Date createTime; private LocalDate createTime;
/** /**
* 高度 * 高度

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

@ -1,19 +1,14 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.domain.XzdSupplierEvaluation;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
@ -70,9 +65,9 @@ public class XzdSupplierEvaluationVo implements Serializable {
* 评价时间 * 评价时间
*/ */
@ExcelProperty(value = "评价时间") @ExcelProperty(value = "评价时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime; private LocalDate evaluationTime;
} }

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

@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -154,9 +155,9 @@ public class XzdSupplierInfoVo implements Serializable {
* 工商变更时间 * 工商变更时间
*/ */
@ExcelProperty(value = "工商变更时间") @ExcelProperty(value = "工商变更时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date industrialCommercialChangeTime; private LocalDate industrialCommercialChangeTime;
/** /**
* 备注 * 备注
@ -189,9 +190,9 @@ public class XzdSupplierInfoVo implements Serializable {
* 单位成立日期 * 单位成立日期
*/ */
@ExcelProperty(value = "单位成立日期") @ExcelProperty(value = "单位成立日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishmentDate; private LocalDate establishmentDate;
/** /**
* 纳税身份类型（字典） * 纳税身份类型（字典）
@ -246,9 +247,9 @@ public class XzdSupplierInfoVo implements Serializable {
* 注册时间 * 注册时间
*/ */
@ExcelProperty(value = "注册时间") @ExcelProperty(value = "注册时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date registrationTime; private LocalDate registrationTime;
/** /**
* 法人代表 * 法人代表

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

@ -2,15 +2,13 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.XzdSupplierQualification; import org.dromara.xzd.domain.XzdSupplierQualification;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
@ -50,17 +48,17 @@ public class XzdSupplierQualificationVo implements Serializable {
* 资质起始日期 * 资质起始日期
*/ */
@ExcelProperty(value = "资质起始日期") @ExcelProperty(value = "资质起始日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime; private LocalDate beginTime;
/** /**
* 资质到期日期 * 资质到期日期
*/ */
@ExcelProperty(value = "资质到期日期") @ExcelProperty(value = "资质到期日期")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private LocalDate endTime;
/** /**
* 文件路径 * 文件路径

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

@ -1,19 +1,16 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
@ -82,7 +79,7 @@ public class XzdSupplierSupplementVo implements Serializable {
* 创建日期 * 创建日期
*/ */
@ExcelProperty(value = "创建日期") @ExcelProperty(value = "创建日期")
private Date createDate; private LocalDate createDate;
/** /**
* 审核标志（0：未审核，1：已审核） * 审核标志（0：未审核，1：已审核）
@ -101,18 +98,18 @@ public class XzdSupplierSupplementVo implements Serializable {
/** /**
* 冻结开始时间 * 冻结开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "冻结开始时间") @ExcelProperty(value = "冻结开始时间")
private Date freezeStartTime; private LocalDate freezeStartTime;
/** /**
* 冻结结束时间 * 冻结结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "冻结结束时间") @ExcelProperty(value = "冻结结束时间")
private Date freezeEndTime; private LocalDate freezeEndTime;
/** /**
* 供应商主类型 * 供应商主类型
@ -141,10 +138,10 @@ public class XzdSupplierSupplementVo implements Serializable {
/** /**
* 合格有效期 * 合格有效期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "合格有效期") @ExcelProperty(value = "合格有效期")
private Date qualificationValidity; private LocalDate qualificationValidity;
/** /**
* 考核小组组长 * 考核小组组长

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

@ -2,7 +2,6 @@ package org.dromara.xzd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; 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.XzdJsqdTz;
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -67,9 +65,9 @@ public class XzdWorkcontractCompletionAdjustVo implements Serializable {
* 单据日期 * 单据日期
*/ */
@ExcelProperty(value = "单据日期") @ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 决算单id * 决算单id

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

@ -1,17 +1,15 @@
package org.dromara.xzd.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.domain.XzdZbjghyd;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; 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") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date ghrq; private LocalDate ghrq;
/** /**
* 归还比例 * 归还比例

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/XzdContractPayment.java
View File

@ -2,15 +2,13 @@ package org.dromara.xzd.skyfk.cbhtsc.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 承包合同收款对象 xzd_contract_payment * 承包合同收款对象 xzd_contract_payment
@ -55,9 +53,9 @@ public class XzdContractPayment extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -77,9 +75,9 @@ public class XzdContractPayment extends BaseEntity {
/** /**
* 实际收款日期 * 实际收款日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date paymentDate; private LocalDate paymentDate;
/** /**
* 项目id * 项目id

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/bo/XzdContractPaymentBo.java
View File

@ -1,6 +1,5 @@
package org.dromara.xzd.skyfk.cbhtsc.domain.bo; package org.dromara.xzd.skyfk.cbhtsc.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.domain.bo.XzdContractSkxxBo;
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo; import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment; import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -58,10 +56,10 @@ public class XzdContractPaymentBo extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -85,9 +83,9 @@ public class XzdContractPaymentBo extends BaseEntity {
* 实际收款日期 * 实际收款日期
*/ */
@NotNull(message = "实际收款日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "实际收款日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date paymentDate; private LocalDate paymentDate;
/** /**
* 项目id * 项目id

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java
View File

@ -2,7 +2,6 @@ package org.dromara.xzd.skyfk.cbhtsc.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; 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.domain.vo.XzdContractSkxxVo;
import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFapiaoVo;
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment; import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -65,10 +63,10 @@ public class XzdContractPaymentVo implements Serializable {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@ExcelProperty(value = "单据日期") @ExcelProperty(value = "单据日期")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id
@ -97,9 +95,9 @@ public class XzdContractPaymentVo implements Serializable {
* 实际收款日期 * 实际收款日期
*/ */
@ExcelProperty(value = "实际收款日期") @ExcelProperty(value = "实际收款日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date paymentDate; private LocalDate paymentDate;
/** /**
* 项目id * 项目id

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java
View File

@ -2,14 +2,12 @@ package org.dromara.xzd.skyfk.fbhtfk.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收款与付款-分包合同付款对象 xzd_skyfk_fbhtfk * 收款与付款-分包合同付款对象 xzd_skyfk_fbhtfk
@ -54,9 +52,9 @@ public class XzdSkyfkFbhtfk extends BaseEntity {
/** /**
* 单据日期 * 单据日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java
View File

@ -1,6 +1,5 @@
package org.dromara.xzd.skyfk.fbhtfk.domain.bo; package org.dromara.xzd.skyfk.fbhtfk.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.XzdSfkFapiao;
import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFukuan; import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFukuan;
import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; 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; import java.util.List;
/** /**
@ -59,9 +57,9 @@ public class XzdSkyfkFbhtfkBo extends BaseEntity {
* 单据日期 * 单据日期
*/ */
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java
View File

@ -2,7 +2,6 @@ package org.dromara.xzd.skyfk.fbhtfk.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; 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.XzdSfkFapiaoVo;
import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFukuanVo; import org.dromara.xzd.paymentsReceipts.domain.vo.XzdSfkFukuanVo;
import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -66,9 +64,9 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
* 单据日期 * 单据日期
*/ */
@ExcelProperty(value = "单据日期") @ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate; private LocalDate documentDate;
/** /**
* 合同id * 合同id

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/XzdSpykpKpsq.java
View File

@ -2,15 +2,13 @@ package org.dromara.xzd.spykp.kpsq.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收票与开票-开票申请对象 xzd_spykp_kpsq * 收票与开票-开票申请对象 xzd_spykp_kpsq
@ -55,9 +53,9 @@ public class XzdSpykpKpsq extends BaseEntity {
/** /**
* 申请日期 * 申请日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date sqrq; private LocalDate sqrq;
/** /**
* 申请人 * 申请人
@ -302,16 +300,16 @@ public class XzdSpykpKpsq extends BaseEntity {
/** /**
* 租赁开始日期 * 租赁开始日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlksrq; private LocalDate zlksrq;
/** /**
* 租赁结束日期 * 租赁结束日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zljsrq; private LocalDate zljsrq;
/** /**
* 红冲原因 * 红冲原因

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/bo/XzdSpykpKpsqBo.java
View File

@ -1,6 +1,5 @@
package org.dromara.xzd.spykp.kpsq.domain.bo; package org.dromara.xzd.spykp.kpsq.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -56,9 +54,9 @@ public class XzdSpykpKpsqBo extends BaseEntity {
/** /**
* 申请日期 * 申请日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date sqrq; private LocalDate sqrq;
/** /**
* 申请人 * 申请人
@ -305,16 +303,16 @@ public class XzdSpykpKpsqBo extends BaseEntity {
/** /**
* 租赁开始日期 * 租赁开始日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlksrq; private LocalDate zlksrq;
/** /**
* 租赁结束日期 * 租赁结束日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zljsrq; private LocalDate zljsrq;
/** /**
* 红冲原因 * 红冲原因

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/domain/vo/XzdSpykpKpsqVo.java
View File

@ -2,17 +2,15 @@ package org.dromara.xzd.spykp.kpsq.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx; import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -63,9 +61,9 @@ public class XzdSpykpKpsqVo implements Serializable {
* 申请日期 * 申请日期
*/ */
@ExcelProperty(value = "申请日期") @ExcelProperty(value = "申请日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date sqrq; private LocalDate sqrq;
/** /**
* 申请人 * 申请人
@ -359,17 +357,17 @@ public class XzdSpykpKpsqVo implements Serializable {
* 租赁开始日期 * 租赁开始日期
*/ */
@ExcelProperty(value = "租赁开始日期") @ExcelProperty(value = "租赁开始日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlksrq; private LocalDate zlksrq;
/** /**
* 租赁结束日期 * 租赁结束日期
*/ */
@ExcelProperty(value = "租赁结束日期") @ExcelProperty(value = "租赁结束日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date zljsrq; private LocalDate zljsrq;
/** /**
* 红冲原因 * 红冲原因

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java
View File

@ -2,15 +2,13 @@ package org.dromara.xzd.spykp.sjsqd.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收据申请单对象 xzd_spykp_sjsqd * 收据申请单对象 xzd_spykp_sjsqd
@ -65,9 +63,9 @@ public class XzdSpykpSjsqd extends BaseEntity {
/** /**
* 日期 * 日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date rq; private LocalDate rq;
/** /**
* 申请人id * 申请人id

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java
View File

@ -1,6 +1,5 @@
package org.dromara.xzd.spykp.sjsqd.domain.bo; package org.dromara.xzd.spykp.sjsqd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; 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.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收据申请单业务对象 xzd_spykp_sjsqd * 收据申请单业务对象 xzd_spykp_sjsqd
@ -70,9 +68,9 @@ public class XzdSpykpSjsqdBo extends BaseEntity {
/** /**
* 日期 * 日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date rq; private LocalDate rq;
/** /**
* 申请人id * 申请人id

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java
View File

@ -2,18 +2,16 @@ package org.dromara.xzd.spykp.sjsqd.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
@ -84,9 +82,9 @@ public class XzdSpykpSjsqdVo implements Serializable {
* 日期 * 日期
*/ */
@ExcelProperty(value = "日期") @ExcelProperty(value = "日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date rq; private LocalDate rq;
/** /**
* 申请人id * 申请人id

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java
View File

@ -1,16 +1,14 @@
package org.dromara.xzd.spykp.spdj.domain; package org.dromara.xzd.spykp.spdj.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableId;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDate;
/** /**
* 收票登记对象 xzd_spykp_spdj * 收票登记对象 xzd_spykp_spdj
@ -75,9 +73,9 @@ public class XzdSpykpSpdj extends BaseEntity {
/** /**
* 开票日期 * 开票日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date kprq; private LocalDate kprq;
/** /**
* 公司税号 * 公司税号

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java
View File

@ -1,17 +1,15 @@
package org.dromara.xzd.spykp.spdj.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.EditGroup;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
/** /**
* 收票登记业务对象 xzd_spykp_spdj * 收票登记业务对象 xzd_spykp_spdj
@ -73,9 +71,9 @@ public class XzdSpykpSpdjBo extends BaseEntity {
/** /**
* 开票日期 * 开票日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date kprq; private LocalDate kprq;
/** /**
* 公司税号 * 公司税号

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java
View File

@ -1,18 +1,15 @@
package org.dromara.xzd.spykp.spdj.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
/** /**
@ -102,9 +99,9 @@ public class XzdSpykpSpdjVo implements Serializable {
* 开票日期 * 开票日期
*/ */
@ExcelProperty(value = "开票日期") @ExcelProperty(value = "开票日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date kprq; private LocalDate kprq;
/** /**
* 公司税号 * 公司税号