java/PlayPai.git

			@@ -31,15 +31,13 @@
			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;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -285,41 +283,24 @@
			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()!=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 +309,10 @@

			@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<CompetitionUser> page = competitionClient.getPeopleFromId1(new GetPeopleQuery(limit, offset, id, state));
			return super.packForBT(page);
			}catch (Exception e){
			e.printStackTrace();
			return ERROR;
			@@ -404,7 +383,7 @@
			}
			}


			@ResponseBody
			@RequestMapping(value = "/cancel")
			public Object cancel(Integer TCompetitionId) {
			try {
			@@ -415,7 +394,7 @@
			return ERROR;
			}
			}

			@ResponseBody
			@RequestMapping(value = "/getPeopleFromId")
			public Object getPeopleFromId(Integer id,Integer state) {
			try {
			@@ -434,11 +413,11 @@
			@ResponseBody
			public Object onChange(Integer oneId) {
			System.out.println("======"+oneId);
			List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 2));
			List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>()
			.eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 2));
			if (list.size()!=0){
			return list;
			}

			try {
			TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
			return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
			@@ -447,6 +426,13 @@
			return ERROR;
			}
			}

			@RequestMapping(value = "/onChange3")
			@ResponseBody
			public Object onChange3(String oneId) {
			TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
			return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
			}
			@RequestMapping(value = "/oneChangeNext")
			@ResponseBody
			public Object oneChangeNext(Integer oneId) {