From 68501d7e6f29f8dfa06c8117aba2d1d53a90f162 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 25 Jul 2023 17:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/entity/bo/SeeYonApproveQuery.java | 18 ++++++------------ .../tbs/service/TbsBudgetMatchApplication.java | 8 ++++---- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java index 91060842..a2632fea 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java @@ -1,6 +1,8 @@ package com.qs.serve.modules.seeyon.entity.bo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -62,24 +64,16 @@ public class SeeYonApproveQuery { /** * 申请开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate applyStartDate; + private String applyStartDate; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate applyEndDate; + private String applyEndDate; /** * 评论结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate commitEndDate; + private String commitEndDate; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate commitStartDate; + private String commitStartDate; private Integer pageNum; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java index 2f8df5fc..df1166b8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java @@ -50,11 +50,11 @@ public class TbsBudgetMatchApplication { break; } } - //TODO 拼接Table，要重新设计显示内容 - - //TODO 关联通用数据 - } + //TODO 拼接Table，要重新设计显示内容 + TbsBudgetTableVo tableData = new TbsBudgetTableVo(); + + //TODO 关联通用数据 return null; }