From 53d9ce668f7775b959f2d1be6f5caf30f43e5f29 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java | 4 ++++
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
index 9e24d47..dcd4dfc 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
@@ -56,6 +56,10 @@
@ChineseDescription("咨询费用")
private BigDecimal consultAmount;
+ @ApiModelProperty(value = "是否后台创建")
+ @ChineseDescription("是否后台创建")
+ private Boolean isBack;
+
@ApiModelProperty(value = "是否测试")
@ChineseDescription("是否测试")
private Boolean testFlag;
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 b3078d5..4c7e248 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
@@ -121,6 +121,9 @@
);
return new SuccessResponseData(list.stream().map(o -> {
+ // 是否后台创建
+ o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getAnswerNo())).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
+
// 是否测试
o.setTestFlag(mentalTestResultAll.stream().filter(oo -> oo.getTopicId().equals(o.getTopicId())).findFirst().isPresent());
--
Gitblit v1.7.1