From dd6313419318b1e544ddb0f5a3385bb905fc6cf0 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期一, 29 四月 2024 01:31:04 +0800
Subject: [PATCH] 修复改出的问题
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
index d486158..a824941 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
@@ -9,7 +9,6 @@
import cn.stylefeng.guns.modular.business.dto.MentalTestMyTestTopicDTO;
import cn.stylefeng.guns.modular.business.dto.MentalTestTopicAndRecordDTO;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
-import cn.stylefeng.guns.modular.business.entity.MentalTestResult;
import cn.stylefeng.guns.modular.business.entity.MentalTestTopic;
import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
import cn.stylefeng.guns.modular.business.service.*;
@@ -106,12 +105,6 @@
}
List<Long> topicIdList = list.stream().map(o -> o.getTopicId()).collect(Collectors.toList());
- List<MentalTestResult> mentalTestResultAll = mentalTestResultService.list(
- Wrappers.<MentalTestResult>lambdaQuery()
- .eq(MentalTestResult::getUserId, userId)
- .in(MentalTestResult::getTopicId, topicIdList)
- .groupBy(MentalTestResult::getTopicId)
- );
List<OrderMentalTest> orderMentalTestAll = orderMentalTestService.list(
Wrappers.<OrderMentalTest>lambdaQuery()
.eq(OrderMentalTest::getUserId, userId)
@@ -121,13 +114,7 @@
return new SuccessResponseData(list.stream().map(o -> {
// 是否后台创建
- o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getAnswerNo()) && oo.getIsBack()).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
-
- // 是否测试
- o.setTestFlag(mentalTestResultAll.stream().filter(oo -> oo.getTopicId().equals(o.getTopicId())).findFirst().isPresent());
-
- // 是否购买
- o.setPayFlag(orderMentalTestAll.stream().filter(oo -> oo.getGoodsId().equals(o.getTopicId())).findFirst().isPresent());
+ o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getOrderNo()) && oo.getIsBack()).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
return o;
}).collect(Collectors.toList()));
--
Gitblit v1.7.1