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 trends(DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest){ -// 分页 + System.out.println("========= trends ============= "+dongCaiSecondaryIndustryRequest.getBusinessDate()); + // 分页 Page page = Querys.page(dongCaiSecondaryIndustryRequest.getPageModel()); // 类型 @@ -206,6 +207,7 @@ public class DongCaiSecondaryIndustryServiceImpl extends ServiceImpl 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 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 wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class); - List list = list(wrapper); +// LambdaQueryWrapper wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class); +// List list = list(wrapper); + List list = new ArrayList<>(); // 分类统计 list.forEach(originalIssueStock -> {