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 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 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 6cb3e3d..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 @@ -1,9 +1,23 @@ package com.dsh.competition.controller; +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.RestController; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -14,8 +28,44 @@ * @since 2023-06-26 */ @RestController -@RequestMapping("/competition") +@RequestMapping("") public class CompetitionController { + + @Autowired + private CompetitionService cttService; + + @Autowired + private UserCompetitionService ucttService; + + private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm"); + + @PostMapping("/base/competition/getCompetitionsDetails") + public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){ + + List<PurchaseRecordVo> recordVos = new ArrayList<>(); + + List<Competition> list = cttService.list(new QueryWrapper<Competition>() + .eq("payType",3 ) + .eq("auditStatus",2)); + List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList()); + 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(); + recordVo.setPurchaseType("报名赛事"); + recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime())); + Competition competition = cttService.getById(coms.getCompetitionId()); + recordVo.setPurchaseAmount("-"+competition.getPrice()); + recordVos.add(recordVo); + }); + } + return recordVos; + } + + } -- Gitblit v1.7.1