From 818e8d1810bcdcbeae5a948ecd115ff0ce5a1f54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index bc7bd58..2bc4b7c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -4,29 +4,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
+import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
-import com.dsh.course.feignClient.course.CourseClient;
-import com.dsh.guns.config.UserExt;
+import com.dsh.course.feignClient.competition.model.Participant;
import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
+import com.dsh.guns.core.support.HttpKit;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IStoreService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import com.dsh.guns.modular.system.util.ExcelExportUtil;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import com.dsh.guns.modular.system.warpper.RoleWarpper;
-import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -37,10 +30,10 @@
* @Date 2020-06-05 17:25:12
*/
@Controller
-@RequestMapping("/TCompetition")
+@RequestMapping("/tCompetition")
public class TCompetitionController extends BaseController {
- private String PREFIX = "/system/TCompetition/";
+ private String PREFIX = "/system/tCompetition/";
@Autowired
private CompetitionClient competitionClient;
@@ -62,7 +55,7 @@
*/
@RequestMapping("/tCompetition_add")
public String tCompetitionAdd(Model model) {
- return PREFIX + "tCompetition_add.html";
+ return PREFIX + "TCompetition_add.html";
}
@@ -79,22 +72,80 @@
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(String provinceCode,String cityCode,String shopName,String eventName,String time,Integer state,Integer registerCondition) {
+ public Object list(String provinceCode, String cityCode, String shopName, String eventName, String time, Integer state, Integer registerCondition) {
List<Integer> ids = new ArrayList<>();
+ List<TStore> list = null;
// 获取门店id
if(ToolUtil.isNotEmpty(shopName)){
- List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().like(TStore::getName, shopName));
+ list = storeService.list(new LambdaQueryWrapper<TStore>().like(TStore::getName, shopName));
ids = list.stream().map(TStore::getId).collect(Collectors.toList());
}else {
+ list = storeService.list();
ids = storeService.list().stream().map(TStore::getId).collect(Collectors.toList());
}
if(ids.size()==0){
ids.add(-1);
}
- ListQuery listQuery = new ListQuery(provinceCode,cityCode,eventName,time,state,registerCondition,ids);
- List<Competition> competitions = competitionClient.list(listQuery);
- return super.warpObject(null);
+ Page<Competition> page = new PageFactory<Competition>().defaultPage();
+ ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ Page<Competition> competitions = competitionClient.list(listQuery);
+ for (Competition competition : competitions.getRecords()) {
+ for (TStore tStore : list) {
+ if(competition.getStoreId().equals(tStore.getId())){
+ competition.setStoreName(tStore.getName());
+ }
+ }
+ }
+ return super.packForBT(competitions);
}
+ @RequestMapping(value = "/add")
+ public Object list(Competition competition) {
+ try {
+ competitionClient.add(competition);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/update")
+ public Object update(Competition competition) {
+ try {
+ competitionClient.update(competition);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+
+ @RequestMapping(value = "/cancel")
+ public Object cancel(Integer id) {
+ try {
+ competitionClient.cancel(id);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/getPeopleFromId")
+ public Object getPeopleFromId(Integer id,Integer state) {
+ try {
+ Page<Object> page = new PageFactory<>().defaultPage();
+ Page<Participant> data = competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
+ return super.packForBT(data);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+
+
}
--
Gitblit v1.7.1