From ee4bd7b4c5ada926ad0ef66a7b7cde080be5a0ff Mon Sep 17 00:00:00 2001
From: qinyingjie <qinyingjie@deepexi.com>
Date: Thu, 22 Dec 2022 22:35:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdsDimFinancialYearWeekInfoController.java    | 4 ++--
 .../springbootkwan/entity/AdsDimFinancialYearWeekInfo.java   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kwan/springbootkwan/controller/AdsDimFinancialYearWeekInfoController.java b/src/main/java/com/kwan/springbootkwan/controller/AdsDimFinancialYearWeekInfoController.java
index 355c8a7..f680dd5 100644
--- a/src/main/java/com/kwan/springbootkwan/controller/AdsDimFinancialYearWeekInfoController.java
+++ b/src/main/java/com/kwan/springbootkwan/controller/AdsDimFinancialYearWeekInfoController.java
@@ -32,8 +32,8 @@ public class AdsDimFinancialYearWeekInfoController {
     @GetMapping("/{financialYear}/{financialYearWeek}")
     public List<AdsDimFinancialYearWeekInfo> selectOne(@PathVariable Integer financialYear, @PathVariable Integer financialYearWeek) {
         return this.adsDimFinancialYearWeekInfoService.list(new QueryWrapper<AdsDimFinancialYearWeekInfo>()
-                .ne("financial_year", financialYear)
-                .ne("financial_year_week", financialYearWeek)
+                .eq("financial_year", financialYear)
+                .eq("financial_year_week", financialYearWeek)
         );
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/kwan/springbootkwan/entity/AdsDimFinancialYearWeekInfo.java b/src/main/java/com/kwan/springbootkwan/entity/AdsDimFinancialYearWeekInfo.java
index a7d0be2..e5f5074 100644
--- a/src/main/java/com/kwan/springbootkwan/entity/AdsDimFinancialYearWeekInfo.java
+++ b/src/main/java/com/kwan/springbootkwan/entity/AdsDimFinancialYearWeekInfo.java
@@ -3,6 +3,7 @@ package com.kwan.springbootkwan.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Builder;
 import lombok.Data;
@@ -19,12 +20,16 @@ public class AdsDimFinancialYearWeekInfo extends Model<AdsDimFinancialYearWeekIn
     //第n财年周
     private Integer financialYearWeek;
     //财年开始日期
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date financialYearStart;
     //财年结束日期
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date financialYearEnd;
     //周开始
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date weekStartDay;
     //周结束
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date weekEndDay;
     //财年周所在季节区间,0:跨9月1号,1:3月到8月,2:9月到2月
     private Integer weekInSeason;
-- 
GitLab