From cf117814b81e7c2cc33913cea14b95d0364d526a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 15:28:00 +0800
Subject: [PATCH] 10.16
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 6872c5f..58c8bb9 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,14 +4,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.*;
+import com.dsh.guns.config.UserExt;
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.ToolUtil;
import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TOperator;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.TOperatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -58,6 +61,9 @@
return PREFIX + "TCompetition.html";
}
+
+ @Autowired
+ private TOperatorService tOperatorService;
/**
* 跳转到添加车辆管理
*/
@@ -65,6 +71,9 @@
public String tCompetitionAdd(Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
+
+ List<TOperator> list1 = tOperatorService.list();
+ model.addAttribute("yysList",list1);
return PREFIX + "TCompetition_add.html";
}
@@ -131,8 +140,16 @@
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());
+ 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());
+ }
+ }
}
}
}
@@ -159,15 +176,24 @@
public Object list(Competition competition) {
try {
if(ToolUtil.isNotEmpty(competition.getProvinceCode())) {
+ System.out.println("=============="+competition);
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
competition.setProvince(one.getName());
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getCityCode()));
competition.setCity(one1.getName());
}
- competition.setAuditStatus(1);
+
+ if (UserExt.getUser().getObjectType() == 1){
+ competition.setAuditStatus(2);
+ }else {
+ competition.setAuditStatus(1);
+ }
+
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- competition.setStartTime(format.parse(competition.getSTime()));
- competition.setEndTime(format.parse(competition.getETime()));
+ SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+ competition.setStartTime(format1.parse(competition.getSTime()));
+ competition.setEndTime(format1.parse(competition.getETime()));
competition.setRegisterEndTime(format.parse(competition.getREndTime()));
competitionClient.add(competition);
return new SuccessTip<>();
--
Gitblit v1.7.1