From 59ad364486c751e68ea61125badeabcbd318fcb2 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期五, 07 七月 2023 17:49:17 +0800
Subject: [PATCH] 去除xml中的unionall连表查询语句
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 200a3ea..b8706ca 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.competition.entity.Competition;
import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.model.GetStuSourseList;
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
@@ -39,8 +40,8 @@
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestParam("appUserId") Integer appUserId){
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
@@ -48,7 +49,10 @@
.eq("payType",3 )
.eq("auditStatus",2));
List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(appUserId,comIds);
+ List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
+ .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
+ .eq("userId", sourseList.getAppUserId())
+ .in("competitionId",comIds ));
if (userCompetitions.size() > 0){
userCompetitions.forEach(coms ->{
PurchaseRecordVo recordVo = new PurchaseRecordVo();
--
Gitblit v1.7.1