Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-04 60ef8b4a95540dfab9df0447364ee40c18354010

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -8,13 +8,11 @@
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -40,7 +38,7 @@
    private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");

    @PostMapping("/competition/getCompetitionsDetails")
    public List<PurchaseRecordVo> getStuSourseList(@RequestParam("appUserId") Integer appUserId){
    public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime, @RequestBody Date  endTime,@RequestParam("appUserId") Integer appUserId){

        List<PurchaseRecordVo> recordVos = new ArrayList<>();

@@ -48,7 +46,7 @@
                .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.queryUsersCompetetions(startTime,endTime,appUserId,comIds);
        if (userCompetitions.size() > 0){
            userCompetitions.forEach(coms ->{
                PurchaseRecordVo recordVo = new PurchaseRecordVo();