From 1898b3a4ab602bd00cc79a83695f27e2c35eb487 Mon Sep 17 00:00:00 2001
From: laixingyu <xingyu.lai@suwell.cn>
Date: Thu, 27 Jul 2023 14:19:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=A8=E9=87=8F=E7=89=88=E5=9D=97=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DongCaiSecondaryIndustryServiceImpl.java    | 12 +++++++++---
 .../service/impl/OriginalIssueStockServiceImpl.java  |  8 +++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/DongCaiSecondaryIndustryServiceImpl.java b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/DongCaiSecondaryIndustryServiceImpl.java
index 485d311..a36403e 100644
--- a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/DongCaiSecondaryIndustryServiceImpl.java
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/DongCaiSecondaryIndustryServiceImpl.java
@@ -192,7 +192,8 @@ public class DongCaiSecondaryIndustryServiceImpl extends ServiceImpl<DongCaiSeco
     }
 
     public PageList<DongCaiSecondaryIndustryResponse> trends(DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest){
-// 分页
+        System.out.println("========= trends ============= "+dongCaiSecondaryIndustryRequest.getBusinessDate());
+        // 分页
         Page<DongCaiSecondaryIndustry> page = Querys.page(dongCaiSecondaryIndustryRequest.getPageModel());
 
         // 类型
@@ -206,6 +207,7 @@ public class DongCaiSecondaryIndustryServiceImpl extends ServiceImpl<DongCaiSeco
         if(ObjectUtil.isEmpty(dongCaiSecondaryIndustryRequest.getBusinessDate())){
             dongCaiSecondaryIndustryRequest.setBusinessDate(DateUtil.parseDate(DateUtil.now()));
         }
+        System.out.println("========= trends1 ============= "+dongCaiSecondaryIndustryRequest.getBusinessDate());
 
 
         // 查询最后的日期
@@ -220,12 +222,16 @@ public class DongCaiSecondaryIndustryServiceImpl extends ServiceImpl<DongCaiSeco
         Date firstDate = null;
         Date secondDate = null;
 
+        //当指定具体日期时，查出来的size为1；此时如果存在传入参数，则应该用传入参数
         if(dongCaiSecondaryIndustryList.size() > 1){
             firstDate = dongCaiSecondaryIndustryList.get(0).getBusinessDate();
         }
+        else{
+            firstDate = dongCaiSecondaryIndustryRequest.getBusinessDate();
+        }
 
-        if(dongCaiSecondaryIndustryList.size() > 2){
-            secondDate = dongCaiSecondaryIndustryList.get(dongCaiSecondaryIndustryList.size() -1).getBusinessDate();
+        if(dongCaiSecondaryIndustryList.size() > 2) {
+            secondDate = dongCaiSecondaryIndustryList.get(dongCaiSecondaryIndustryList.size() - 1).getBusinessDate();
         }
 
         String sortField = dongCaiSecondaryIndustryRequest.getPageModel().getSortField();
diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/OriginalIssueStockServiceImpl.java b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/OriginalIssueStockServiceImpl.java
index 4916d3f..31bd0ca 100644
--- a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/OriginalIssueStockServiceImpl.java
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/service/impl/OriginalIssueStockServiceImpl.java
@@ -108,11 +108,12 @@ public class OriginalIssueStockServiceImpl extends ServiceImpl<OriginalIssueStoc
 
     @Override
     public BigStockDataResponse riseLossesStatistics(UserCache userCache, OriginalIssueStockRequest originalIssueStockRequest) {
+        System.out.println("========= riseLossesStatistics ============= "+originalIssueStockRequest.getBusinessDate());
         if (ObjectUtil.isEmpty(originalIssueStockRequest.getBusinessDate())) {
 
             originalIssueStockRequest.setBusinessDate(DateUtil.parseDate(DateUtil.now()));
         }
-
+        System.out.println("========= riseLossesStatistics2 ============= "+originalIssueStockRequest.getBusinessDate());
         BigStockDataResponse response = new BigStockDataResponse();
         List<String> asList = Arrays.asList(">=10%", ">=7%", "7-5%", "5-3%", "3-0%", "平", "0至-3%", "-3至-5%", "-5至-7%", "<=-7%", "<=-10%");
         response.setXAxis(asList);
@@ -129,8 +130,9 @@ public class OriginalIssueStockServiceImpl extends ServiceImpl<OriginalIssueStoc
         AtomicInteger equalNum = new AtomicInteger(0);
 
         // 查询当前日期的所有数据
-        LambdaQueryWrapper<OriginalIssueStock> wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class);
-        List<OriginalIssueStock> list = list(wrapper);
+//        LambdaQueryWrapper<OriginalIssueStock> wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class);
+//        List<OriginalIssueStock> list = list(wrapper);
+        List<OriginalIssueStock> list = new ArrayList<>();
 
         // 分类统计
         list.forEach(originalIssueStock -> {