Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-04 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java

@@ -31,6 +31,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import sun.rmi.runtime.Log;

import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
@@ -285,41 +286,41 @@
        ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids,UserExt.getUser().getObjectType());
        Page<Competition> competitions = competitionClient.list(listQuery);
        List<Competition> records = new ArrayList<>();
//        for (Competition competition : competitions.getRecords()) {
////            if (competition.getStatus()==4){
////                continue;
////            }
//
//            // 当前时间小于开始时间
//            if (competition.getStartTime().after(new Date())){
//                competition.setStatus(1);
//            }
//            if (competition.getStartTime().before(new Date())){
//
//
//                if (competition.getEndTime().after(new Date())){
//                    competition.setStatus(2);
//                }else{
//                    competition.setStatus(3);
//                }
//            }
//            if (competition.getStatus()!=state && state != null){
//            }else{
//                records.add(competition);
//            }
//            for (TStore tStore : list) {
//                String[] split = competition.getStoreId().split(",");
//                for (String s : split) {
//                    if(s.equals(String.valueOf(tStore.getId()))){
//                        if (competition.getStoreName()==null){
//                            competition.setStoreName(tStore.getName());
//                        }else {
//                            competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
//                        }
//                    }
//                }
//            }
//        }
        for (Competition competition : competitions.getRecords()) {
            if (competition.getStatus()==4){
                continue;
            }

            // 当前时间小于开始时间
            if (competition.getStartTime().after(new Date())){
                competition.setStatus(1);
            }
            if (competition.getStartTime().before(new Date())){


                if (competition.getEndTime().after(new Date())){
                    competition.setStatus(2);
                }else{
                    competition.setStatus(3);
                }
            }
            if (competition.getStatus()!=state && state != null){
            }else{
                records.add(competition);
            }
            for (TStore tStore : list) {
                String[] split = competition.getStoreId().split(",");
                for (String s : split) {
                    if(s.equals(String.valueOf(tStore.getId()))){
                        if (competition.getStoreName()==null){
                            competition.setStoreName(tStore.getName());
                        }else {
                            competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
                        }
                    }
                }
            }
        }
        competitions.setRecords(records);
        System.err.println(competitions.getRecords());
        return  super.packForBT(competitions);
@@ -328,12 +329,12 @@

    @RequestMapping(value = "/listUser/{id}")
    @ResponseBody
    public Object listUser(@PathVariable Integer id,Integer state) {
    public Object listUser(@PathVariable Integer id,Integer state, Integer offset,Integer limit) {
        try {
            Page<Object> page = new PageFactory<>().defaultPage();
            Page<CompetitionUser> data =  competitionClient.getPeopleFromId
                    (new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            return  super.packForBT(data);
//            Page<Object> page = new PageFactory<>().defaultPage();
//            Page<CompetitionUser> data =  competitionClient.getPeopleFromId(new GetPeopleQuery(limit,offset,id,state));
            List <CompetitionUser> data =  competitionClient.getPeopleFromId1(new GetPeopleQuery(limit,offset,id,state));
            return  data;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;