fix: 修复首页查询动量版块异常问题;修复排序问题

dev
laixingyu 3 years ago
parent 63fde2b21b
commit 1898b3a4ab

@ -192,6 +192,7 @@ 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,9 +222,13 @@ 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();

@ -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 -> {

Loading…
Cancel
Save