From eb0e6ca6b34ece17efac15e7fc451bd99d07a41a Mon Sep 17 00:00:00 2001
From: Lxy <windsdreaming@163.com>
Date: Sun, 25 Jan 2026 11:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=BA=A4=E6=98=93=E6=97=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StockDataController.java       | 10 ++++++++
 .../mapper/TStockDailyTradeMapper.java        |  7 ++++++
 .../service/IStockDailyTradeService.java      |  7 ++++++
 .../service/impl/StockBasicServiceImpl.java   |  2 +-
 .../impl/StockDailyTradeServiceImpl.java      |  6 +++++
 .../newstocksystem/StockDailyTradeMapper.xml  |  5 ++++
 ruoyi-ui/src/api/newstocksystem/stockdata.js  | 10 +++++++-
 .../src/views/newstocksystem/stockdata.vue    | 25 +++++++++++++++----
 8 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/StockDataController.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/StockDataController.java
index 862c9ce..01ec398 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/StockDataController.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/StockDataController.java
@@ -310,6 +310,16 @@ public class StockDataController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询最后一个交易日
+     */
+    @GetMapping("/stockDailyTrade/lastTradeDate2")
+    public AjaxResult getLastTradeDate()
+    {
+        String lastTradeDate = stockDailyTradeService.selectLastTradeDate();
+        return AjaxResult.success(lastTradeDate);
+    }
+
     // ========================= 个股新高新低状态相关接口 =========================
 
     /**
diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/mapper/TStockDailyTradeMapper.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/mapper/TStockDailyTradeMapper.java
index 755c0fe..7b02bbd 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/mapper/TStockDailyTradeMapper.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/mapper/TStockDailyTradeMapper.java
@@ -102,4 +102,11 @@ public interface TStockDailyTradeMapper
      * @return 强势股列表
      */
     public List<TStockDailyTrade> selectStrongStockList(TStockDailyTrade stockDailyTrade);
+
+    /**
+     * 查询最后一个交易日
+     * 
+     * @return 最后一个交易日（格式：yyyy-MM-dd）
+     */
+    public String selectLastTradeDate();
 }
diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/IStockDailyTradeService.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/IStockDailyTradeService.java
index afbc2e9..b5d37b6 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/IStockDailyTradeService.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/IStockDailyTradeService.java
@@ -94,4 +94,11 @@ public interface IStockDailyTradeService
      * @return 强势股列表
      */
     public List<TStockDailyTrade> selectStrongStockList(TStockDailyTrade stockDailyTrade);
+
+    /**
+     * 查询最后一个交易日
+     * 
+     * @return 最后一个交易日（格式：yyyy-MM-dd）
+     */
+    public String selectLastTradeDate();
 }
diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockBasicServiceImpl.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockBasicServiceImpl.java
index 8db5e8d..a244af3 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockBasicServiceImpl.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockBasicServiceImpl.java
@@ -16,7 +16,7 @@ import com.ruoyi.newstocksystem.service.IStockBasicService;
  * @author lxy
  * @date 2026-01-21
  */
-@Service
+@Service("newStockBasicService")
 public class StockBasicServiceImpl implements IStockBasicService
 {
     @Autowired
diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java
index d2d5cb6..c0c3dfd 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/service/impl/StockDailyTradeServiceImpl.java
@@ -379,4 +379,10 @@ public class StockDailyTradeServiceImpl implements IStockDailyTradeService
     {
         return stockDailyTradeMapper.selectStrongStockList(stockDailyTrade);
     }
+
+    @Override
+    public String selectLastTradeDate()
+    {
+        return stockDailyTradeMapper.selectLastTradeDate();
+    }
 }
\ No newline at end of file
diff --git a/newstock-system/src/main/resources/mapper/newstocksystem/StockDailyTradeMapper.xml b/newstock-system/src/main/resources/mapper/newstocksystem/StockDailyTradeMapper.xml
index 64a5c99..b9e9af4 100644
--- a/newstock-system/src/main/resources/mapper/newstocksystem/StockDailyTradeMapper.xml
+++ b/newstock-system/src/main/resources/mapper/newstocksystem/StockDailyTradeMapper.xml
@@ -111,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by trade_date desc
     </select>
 
+    <select id="selectLastTradeDate" resultType="String">
+        select DATE_FORMAT(max(trade_date), '%Y-%m-%d') as trade_date 
+        from t_stock_daily_trade
+    </select>
+
     <select id="selectLimitUpStockList" parameterType="com.ruoyi.newstocksystem.domain.TStockDailyTrade" resultMap="StockDailyTradeWithBasicResult">
         <include refid="selectStockDailyTradeWithBasicVo" />
         <where>
diff --git a/ruoyi-ui/src/api/newstocksystem/stockdata.js b/ruoyi-ui/src/api/newstocksystem/stockdata.js
index ddac247..8d97c53 100644
--- a/ruoyi-ui/src/api/newstocksystem/stockdata.js
+++ b/ruoyi-ui/src/api/newstocksystem/stockdata.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 股票行情数据 API
 export default {
   // ========================= 行业指数相关 =========================
-  
+
   // 查询行业指数列表
   listIndustryIndex(query) {
     return request({
@@ -150,6 +150,14 @@ export default {
     })
   },
 
+  // 查询最后一个交易日
+  getLastTradeDate() {
+    return request({
+      url: '/newstocksystem/stockdata/stockDailyTrade/lastTradeDate2',
+      method: 'get'
+    })
+  },
+
   // ========================= 个股新高新低状态相关 =========================
 
   // 查询个股新高新低状态列表
diff --git a/ruoyi-ui/src/views/newstocksystem/stockdata.vue b/ruoyi-ui/src/views/newstocksystem/stockdata.vue
index de8c83d..c383bf0 100644
--- a/ruoyi-ui/src/views/newstocksystem/stockdata.vue
+++ b/ruoyi-ui/src/views/newstocksystem/stockdata.vue
@@ -356,7 +356,7 @@ export default {
   },
   created() {
     this.getIndustryOptions()
-    this.getDailyTradeList()
+    this.getLastTradeDate()
   },
   methods: {
     // ========================= 通用方法 =========================
@@ -368,15 +368,30 @@ export default {
       })
     },
 
+    /** 获取最后一个交易日 */
+    getLastTradeDate() {
+      stockdataApi.getLastTradeDate().then(response => {
+        const lastTradeDate = response.data
+        if (lastTradeDate) {
+          // 设置所有日期筛选器的默认值
+          this.dailyTradeQuery.tradeDate = lastTradeDate
+          this.industryIndexQuery.tradeDate = lastTradeDate
+          this.stockHighLowQuery.tradeDate = lastTradeDate
+        }
+        // 在获取到最后交易日后，再调用查询方法，确保日期已经设置
+        this.getDailyTradeList()
+      })
+    },
+
     /** Tab 切换 */
     handleTabClick(tab) {
-      if (tab.name === 'dailyTrade' && this.dailyTradeList.length === 0) {
+      if (tab.name === 'dailyTrade') {
         this.getDailyTradeList()
-      } else if (tab.name === 'stockBasic' && this.stockBasicList.length === 0) {
+      } else if (tab.name === 'stockBasic') {
         this.getStockBasicList()
-      } else if (tab.name === 'industryIndex' && this.industryIndexList.length === 0) {
+      } else if (tab.name === 'industryIndex') {
         this.getIndustryIndexList()
-      } else if (tab.name === 'stockHighLow' && this.stockHighLowList.length === 0) {
+      } else if (tab.name === 'stockHighLow') {
         this.getStockHighLowList()
       }
     },