From 8819bd3c33627e931839cf55ad188c04de765fbc Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 29 Aug 2024 16:13:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=B9=B4=E5=BA=A6=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=B8=93=E5=AE=B6=E9=A6=96=E9=A1=B5=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=B9=B4=E5=BA=A6=E5=92=8C=E5=B1=82=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompPointController.java | 16 +++++++++++ ...petitionProjectRegistrationController.java | 28 ++++++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java index 5b2b5c14..f69fa4ec 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java @@ -50,6 +50,7 @@ import org.jeecg.modules.demo.expert.entity.Expert; import org.jeecg.modules.demo.expert.service.IExpertService; import org.jeecg.modules.demo.expscore.entity.ExpScore; import org.jeecg.modules.demo.expscore.service.IExpScoreService; +import org.jeecg.modules.demo.projectlevel.service.IProjectlevelService; import org.jeecg.modules.demo.score_management.entity.ScoreManagement; import org.jeecg.modules.demo.scorepersion.entity.ScorePersion; import org.jeecg.modules.demo.scorepersion.service.IScorePersionService; @@ -139,6 +140,9 @@ public class AnnualCompPointController extends JeecgController xsfxbg( HttpServletRequest req,@RequestParam(name = "recreateFlag") boolean recreateFlag) { + public Result xsfxbg( HttpServletRequest req,@RequestParam(name = "recreateFlag") boolean recreateFlag,@RequestParam(name = "annualid") String annualid) { final String XSFXBG = "xsfxbg"; Map map = new HashMap<>(); @@ -1762,6 +1762,22 @@ public class AnnualCompetitionProjectRegistrationController { QueryWrapper queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); queryWrapperbm.in("enroll_code",bmbhs); queryWrapperbm.eq("enroll_static", "2"); + //年度id传过来后需要根据年度id查询有哪些年度比赛，根据年度比赛查询年度比赛项目，然后把得到的年度比赛项目id加到条件中 + if(!annualid.equals("")){ + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.eq("annualid",annualid); + List listac = annualCompService.list(queryWrapperAnnual); + if(listac.size()>0){ + List tjndbsids = listac.stream().map(AnnualComp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperacpt = new QueryWrapper<>(); + queryWrapperacpt.in("annual_comp_id",tjndbsids); + List listacpt = annualCompPointService.list(queryWrapperacpt); + if(listacpt.size()>0){ + List tjndbsxmids = listacpt.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); + queryWrapperbm.in("annual_compid",tjndbsxmids); + } + } + } List listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); //参加比赛项目数量 map.put("cjbsxmsl",listbm.size()); @@ -2019,7 +2035,7 @@ public class AnnualCompetitionProjectRegistrationController { if (hasKey) { return Result.OK(redisUtil.get(XSFXBG)); } else { - return this.xsfxbg(req,true); + return this.xsfxbg(req,true,annualid); } } } @@ -2033,7 +2049,7 @@ public class AnnualCompetitionProjectRegistrationController { */ @ApiOperation(value="组委会角色分析报告比赛数据接口", notes="组委会角色分析报告比赛数据接口") @GetMapping(value = "/zwhfxbg") - public Result zwhfxbg( HttpServletRequest req,@RequestParam(name = "recreateFlag") boolean recreateFlag) { + public Result zwhfxbg( HttpServletRequest req,@RequestParam(name = "recreateFlag") boolean recreateFlag,@RequestParam(name = "annualid") String annualid) { final String ZWHFXBG = "zwhfxbg"; Map map = new HashMap<>(); if (recreateFlag) { @@ -2048,6 +2064,10 @@ public class AnnualCompetitionProjectRegistrationController { List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); queryWrapperAnnual.in(ids.size() != 0, "compid", ids); + //加上判断如果年度id传过来就加上条件 + if(!annualid.equals("")){ + queryWrapperAnnual.eq("annualid",annualid); + } queryWrapperAnnual.orderByDesc("create_time"); List annualCompList = annualCompService.list(queryWrapperAnnual); if (annualCompList.size() > 0) { @@ -2395,7 +2415,7 @@ public class AnnualCompetitionProjectRegistrationController { if (hasKey) { return Result.OK(redisUtil.get(ZWHFXBG)); } else { - return this.zwhfxbg(req,true); + return this.zwhfxbg(req,true,annualid); } } } From e3cc8e5ac204a67abdb88ffbfad8cf523b8cdcf4 Mon Sep 17 00:00:00 2001 From: significative <163999932+significative@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:42:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0annuali?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/api/common/api.ts | 24 +- jeecgboot-vue3-master/src/api/demo/depart.ts | 12 +- .../comprehensiveEvaluation/individual.vue | 27 +- .../organizingCommittee.vue | 431 ++++++++++-------- .../workbench/components/chExpert/index.vue | 22 +- 5 files changed, 299 insertions(+), 217 deletions(-) diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts index 3499047f..6ec6b129 100644 --- a/jeecgboot-vue3-master/src/api/common/api.ts +++ b/jeecgboot-vue3-master/src/api/common/api.ts @@ -170,41 +170,43 @@ export const uploadMyFile = (url, data) => { return defHttp.uploadMyFile(url, data); }; // 组委会首页 -export const getOrganizingCommittee = (params={recreateFlag:false}) => { +export const getOrganizingCommittee = (params = { recreateFlag: false }) => { return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs', + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs', params }) } // 学生首页 -export const getStudent = (params={recreateFlag:false}) => { +export const getStudent = (params = { recreateFlag: false }) => { return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs', + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs', params }) } // 组委会报告 // /annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg -export const getOrganizingCommitteeReport = (params={recreateFlag:false}) => { +export const getOrganizingCommitteeReport = (params = {}) => { + const par = { recreateFlag: false, annualid: '' }; + Object.assign(par, params); return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg', - params + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg', + params: par }) } // /user/login/homepage/report4School // 学校综合报告 -export const getComprehensiveReport = (params={}) => { +export const getComprehensiveReport = (params = {}) => { return defHttp.get({ - url:'/user/login/homepage/report4School', + url: '/user/login/homepage/report4School', params }) } // 部门 // http://localhost:18083/jeecg-boot/user/login/homepage/report4Depart -export const getdepartmentReport = (params:any={}) => { +export const getdepartmentReport = (params: any = {}) => { return defHttp.get({ - url:'/user/login/homepage/report4School', + url: '/user/login/homepage/report4School', params }) } \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/api/demo/depart.ts b/jeecgboot-vue3-master/src/api/demo/depart.ts index 9188a0fb..ccda18c8 100644 --- a/jeecgboot-vue3-master/src/api/demo/depart.ts +++ b/jeecgboot-vue3-master/src/api/demo/depart.ts @@ -10,6 +10,14 @@ enum Api { // Get personal center-basic settings export const pageSchoolApi = () => defHttp.get({ url: Api.PAGE_SCHOOL }); export const pageDepartmentApi = (orgCode: string) => defHttp.get({ url: Api.PAGE_DEPARTMENT, params: { orgCode } }); -export const getZjsybsjs = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_ZJSYBSJS, params }); -export const getXsfxbg = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_XSFXBG, params }); +export const getZjsybsjs = (params = {}) => { + const par = { recreateFlag: false }; + Object.assign(par, params); + return defHttp.get({ url: Api.PAGE_ZJSYBSJS, params: par }); +}; +export const getXsfxbg = (params = {}) => { + const par = { recreateFlag: false, annualid: '' }; + Object.assign(par, params); + return defHttp.get({ url: Api.PAGE_XSFXBG, params: par }); +}; diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue index d0636fdf..c346e38c 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue @@ -1,6 +1,8 @@ diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue index 499ce43c..ee2a5d9c 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue @@ -56,15 +56,19 @@
序号
+
年度
年度比赛名称
年度比赛项目
+
项目层次
{{ o.xh }}
+
{{ o.nd }}
{{ o.ndbs }}
{{ o.ndbsxm }}
+
{{ o.cc }}
@@ -85,15 +89,19 @@
序号
+
年度
年度比赛名称
年度比赛项目
+
项目层次
{{ o.xh }}
+
{{ o.nd }}
{{ o.ndbs }}
{{ o.ndbsxm }}
+
{{ o.cc }}
@@ -112,7 +120,9 @@ import { ref } from 'vue' type o = { xh: string, ndbs: string, - ndbsxm: string + ndbsxm: string, + nd: string, + cc: string, } type ob = { jxzndbsxmNumber: number; @@ -270,13 +280,21 @@ function reset() { } .name { - width: calc((542 / 756) * 100%); + width: calc((208 / 756) * 100%); } .newp { width: calc((134 / 756) * 100%); } + .nd { + width: calc((174 / 756) * 100%); + } + + .cc { + width: calc((160 / 756) * 100%); + } + //.total { // width: calc((74 / 756) * 100%); //}