From e001432ed29dee8ec7dceb47ab87cf67e58cc9cc Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Thu, 18 Jul 2024 10:01:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B2=B3=E5=8D=97=E6=9C=BA=E7=94=B5?= =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=AD=A6=E9=99=A2-=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/homepage/vo/Last5YearDataVo.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/vo/Last5YearDataVo.java diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/vo/Last5YearDataVo.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/vo/Last5YearDataVo.java deleted file mode 100644 index 737626ea..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/vo/Last5YearDataVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.jeecg.modules.demo.homepage.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: TODO - * @Author: Z.H.C - * @CreateTime: 2023-11-30 16:08 - * @Version: 1.0 - */ - -@Data -public class Last5YearDataVo implements Serializable { - -// @ApiModelProperty(value = "主键") -// private String id; - - /** - * 比赛名称 - */ -// @ApiModelProperty(value = "比赛名称") -// private String compName; - - @ApiModelProperty(value = "年度") - private String year; - - @ApiModelProperty(value = "比赛数量") - private Integer compCount; - - @ApiModelProperty(value = "参赛人数量") - private Integer personCount; -} From 5b4c7b46a42102758becc48e45b449fe946da239 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Thu, 18 Jul 2024 10:04:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B2=B3=E5=8D=97=E6=9C=BA=E7=94=B5?= =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=AD=A6=E9=99=A2-=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/config/shiro/ShiroConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 6a81b561..cbd608a0 100644 --- a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -140,7 +140,6 @@ public class ShiroConfig { //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面 //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试 filterChainDefinitionMap.put("/comp/bigScreen/**", "anon");//比赛大屏 - filterChainDefinitionMap.put("/user/login/homepage/**", "anon");//比赛大屏 filterChainDefinitionMap.put("/admin/inde/inde", "anon");//比赛大屏 //websocket排除 From 29295918c226f9f8268b20c8ca723daccce6b038 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 18 Jul 2024 10:15:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=84=E5=A7=94=E4=BC=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=99=BB=E5=BD=95=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nualCompetitionProjectRegistrationController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java index 6e4255c0..99791ff3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java @@ -963,7 +963,17 @@ public class AnnualCompetitionProjectRegistrationController { @GetMapping(value = "/zwhsybsjs") public Result zwhsybsjs( HttpServletRequest req) { //获取当前登录用户 最新的年度比赛记录 - List annualCompList = getZXAnnualComp(req); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + Comp comp = new Comp(); + QueryWrapper queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); + queryWrappercomp.like("comp_admin",user.getUsername()); + List list = compService.list(queryWrappercomp); + List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.in(ids.size()!=0,"compid",ids); + queryWrapperAnnual.orderByDesc("create_time"); + List annualCompList = annualCompService.list(queryWrapperAnnual); + //List annualCompList = getZXAnnualComp(req); Map map = new HashMap<>(); //年度比赛名称 map.put("annualCompName",annualCompList.get(0).getName()); From 4fef3b931c4fc2e72b6750cf29b49ee708ae6935 Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Thu, 18 Jul 2024 10:25:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?'=E8=B0=83=E7=94=A8=E7=BB=84=E5=A7=94?= =?UTF-8?q?=E4=BC=9A=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/api/common/api.ts | 6 ++++++ .../components/organizingCommittee/organizingCommittee.vue | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts index 38d07129..33ea0fd6 100644 --- a/jeecgboot-vue3-master/src/api/common/api.ts +++ b/jeecgboot-vue3-master/src/api/common/api.ts @@ -153,3 +153,9 @@ export const getFileblob = (url, parameter) => { export const uploadMyFile = (url, data) => { return defHttp.uploadMyFile(url, data); }; +// 组委会首页 +export const getOrganizingCommittee = () => { + return defHttp.get({ + url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs' + }) +} \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue index cb2cda11..ad6b0b54 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue @@ -99,6 +99,7 @@ import cardListTow from '../components/cardListtow.vue'; import cardListThree from '../components/cardListThree.vue'; import echarts from '/@/utils/lib/echarts'; + import { getOrganizingCommittee }from '/@/api/common/api' const throttle = (fn: any) => { let timer: any; return function () { @@ -112,6 +113,12 @@ }, 1000); }; }; + const getOrganizingCommitteeEvent = async () => { + const res = await getOrganizingCommittee() + console.log(res); + + } + getOrganizingCommitteeEvent() const initContent = () => { const myChart = echarts.init(document.getElementById('chart-content')); const option = { From df2713a98d9093730d189a7510e640883d8f4571 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 18 Jul 2024 10:45:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BB=84=E5=A7=94=E4=BC=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=99=BB=E5=BD=95=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 2 +- ...petitionProjectRegistrationController.java | 35 +++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index cbd608a0..94d264f4 100644 --- a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -99,7 +99,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 filterChainDefinitionMap.put("/cms/front/**", "anon"); //cms不拦截 - filterChainDefinitionMap.put("/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs", "anon"); //组委会首页接口不拦截 + //filterChainDefinitionMap.put("/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs", "anon"); //组委会首页接口不拦截 //CMS门户 filterChainDefinitionMap.put("/cms/front/**","anon"); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java index 99791ff3..ecdf38d9 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java @@ -990,18 +990,33 @@ public class AnnualCompetitionProjectRegistrationController { map.put("bsxmSum",listacp.size()); //前五条项目名称数据以及对应的报名数 List> xmListMap = new ArrayList<>(); - for (int i = 0 ; i <5;i++){ - AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); - QueryWrapper queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); - queryWrapperbm.eq("annual_compid",listacp.get(i).getId()); - queryWrapperbm.eq("enroll_static", "2"); - List listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); - Map map1 = new HashMap<>(); - map1.put("xmname",listacp.get(i).getObjName()); - map1.put("xmbmrs",listbm.size()); - xmListMap.add(map1); + if(listacp.size()>5){ + for (int i = 0 ; i <5;i++){ + AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); + QueryWrapper queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); + queryWrapperbm.eq("annual_compid",listacp.get(i).getId()); + queryWrapperbm.eq("enroll_static", "2"); + List listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); + Map map1 = new HashMap<>(); + map1.put("xmname",listacp.get(i).getObjName()); + map1.put("xmbmrs",listbm.size()); + xmListMap.add(map1); + } + }else{ + for (int m = 0 ; m queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); + queryWrapperbm.eq("annual_compid",listacp.get(m).getId()); + queryWrapperbm.eq("enroll_static", "2"); + List listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); + Map map1 = new HashMap<>(); + map1.put("xmname",listacp.get(m).getObjName()); + map1.put("xmbmrs",listbm.size()); + xmListMap.add(map1); + } } + map.put("qwtxmList",xmListMap); //参加比赛队伍数(报名数) List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); From 562d9b1caed41138a67e900553e212b67d0261d2 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 18 Jul 2024 11:55:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=84=E5=A7=94=E4=BC=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=99=BB=E5=BD=95=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnnualCompetitionProjectRegistrationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java index ecdf38d9..25d085b3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java @@ -1115,8 +1115,8 @@ public class AnnualCompetitionProjectRegistrationController { } //参赛院系人数排名(只取前六条) if(listcs.size()==0){ - map.put("csyxbmpm",null); - map.put("bmxsxxList",null); + map.put("csyxbmpm",new ArrayList<>()); + map.put("bmxsxxList",new ArrayList<>()); }else { //拿到所有的userid List userIds = listcs.stream().map(TeamManagement::getUserId).collect(Collectors.toList());