From c35148a017ba818bd1897733dcdeb8c20454c03b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 10:52:08 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationReportController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationReportController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationReportController.java
index 342bdc9..4d8bd75 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationReportController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationReportController.java
@@ -1,12 +1,12 @@
package com.xinquan.meditation.controller.client;
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
-import com.xinquan.common.security.utils.SecurityUtils;
import com.xinquan.meditation.api.domain.Meditation;
import com.xinquan.meditation.api.domain.dto.MeditationQuestionDTO;
import com.xinquan.meditation.domain.MeditationCategory;
@@ -15,8 +15,7 @@
import com.xinquan.meditation.service.MeditationReportService;
import com.xinquan.meditation.service.MeditationService;
import com.xinquan.system.api.domain.AppUser;
-import com.xinquan.system.api.domain.MeditationQuestion;
-import com.xinquan.system.api.domain.MeditationReport;
+import com.xinquan.meditation.api.domain.MeditationQuestion;
import com.xinquan.system.api.domain.MeditationReport;
import com.xinquan.user.api.feign.RemoteAppUserService;
import io.swagger.annotations.ApiOperation;
@@ -63,9 +62,9 @@
}
meditationLambdaQueryWrapper.in(MeditationReport::getReportUserId,data);
}
- if (StringUtils.hasLength(dto.getName())){
+ if (StringUtils.hasLength(dto.getMeditationName())){
List<Long> collect = meditationService.lambdaQuery()
- .like(Meditation::getMeditationTitle, dto.getName())
+ .like(Meditation::getMeditationTitle, dto.getMeditationName())
.list().stream().map(Meditation::getId).collect(Collectors.toList());
if (collect.isEmpty()){
collect.add(-1L);
@@ -99,6 +98,8 @@
record.setAvatar(data.getAvatar());
record.setCellPhone(data.getCellPhone());
}
+ record.setShowFlag(byId1.getShowFlag());
+ record.setReplyContent(byId1.getReplyContent());
}
AppUser data = remoteAppUserService.getAppUserById(record.getReportUserId().toString()).getData();
if (data!=null){
@@ -109,6 +110,14 @@
Meditation byId = meditationService.getById(record.getMeditationId());
if (byId!=null){
record.setMeditationName(byId.getMeditationTitle());
+ record.setChargeType(byId.getChargeType());
+ MeditationCategory byId2 = meditationCategoryService.getById(byId.getCateId());
+ if (byId2!=null){
+ record.setMeditationCategoryName(byId2.getCategoryName());
+ }
+ record.setCoverUrl(byId.getCoverUrl().split(",")[0]);
+ record.setMeditationName(byId.getMeditationTitle());
+
}
}
return R.ok(PageDTO.of(page, MeditationReport.class));
@@ -127,6 +136,7 @@
byId.setAvatar(data.getAvatar());
byId.setCellPhone(data.getCellPhone());
}
+ byId.setReplyContent(byId3.getReplyContent());
if (data1!=null){
byId.setUserNameReport(data1.getNickname());
byId.setAvatarReport(data1.getAvatar());
@@ -135,14 +145,14 @@
Meditation byId1 = meditationService.getById(byId.getMeditationId());
if (byId1!=null){
byId.setMeditationName(byId1.getMeditationTitle());
+ byId.setCoverUrl(byId1.getCoverUrl().split(",")[0]);
byId.setChargeType(byId1.getChargeType());
}
MeditationCategory byId2 = meditationCategoryService.getById(byId1.getCateId());
if (byId2!=null){
byId.setMeditationCategoryName(byId2.getCategoryName());
-
}
- return R.ok();
+ return R.ok(byId);
}
@PostMapping("/deleteMeditationReportQuestion")
--
Gitblit v1.7.1