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 05841c76..2aa65af5 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 @@ -595,7 +595,7 @@ public class AnnualCompetitionProjectRegistrationController { //设置报名编号 management.setEnrollCode(enrollCode); //根据名称查用户id(如果前端传的只是姓名的话) - SysUser user = sysUserService.query().eq("realname", management.getUserId()).one(); + SysUser user = sysUserService.query().eq("id", management.getUserId()).one(); management.setUserId(user.getId()); //补全用户未输入信息 -- 是否队长 if (management.getCaptain() == null) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java index 80251297..1ec8927e 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java @@ -152,7 +152,7 @@ public class AwardPersionController extends JeecgController page = new Page(pageNo, pageSize); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, req.getParameterMap()); - queryWrapper.eq("studentorg",sysDepartService.queryDepartsByUsername(user.getUsername()).get(0).getOrgCode()); + queryWrapper.eq("studentorg",sysDepartService.queryDepartsByUsername(user.getUsername()).get(0).getId()); IPage pageList = awardPersionService.page(page, queryWrapper); return Result.OK(pageList); }else { @@ -225,7 +225,7 @@ public class AwardPersionController extends JeecgController listtm = teamManagementService.list(queryWrappertm); for (int l = 0 ; l < listtm.size() ; l++){ SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId()); - list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode()); + list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId()); if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){ list.get(i).setAwardsort(1); list.get(i).setAwardid(listaca.get(0).getId()); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java index 048e76e2..ee96092f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java @@ -197,6 +197,15 @@ public class ChaoseTopicPersionController extends JeecgController bmbhadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="xmtmid",required=true) String xmtmid,HttpServletRequest req) { String strs[] = ids.split(","); + for (int o = 0 ; o < strs.length ; o++){ + UpfilePersion upfilePersion = upfilePersionService.getById(strs[o]); + QueryWrapper queryWrapperctp1 = new QueryWrapper<>(); + queryWrapperctp1.eq("bmcode",upfilePersion.getApplyCode()); + List listctp1 = chaoseTopicPersionService.list(queryWrapperctp1); + if(listctp1.size()==0){ + return Result.error(upfilePersion.getTopicName()+"未选题，绑定失败！"); + } + } AnnComGroTop annComGroTop = new AnnComGroTop(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap()); queryWrapper.eq("ann_com_p_g",xmtmid); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java index 2124ed14..ae0ee480 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java @@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; @@ -155,11 +158,13 @@ public class ExpScoreController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap()); queryWrapper.eq("annid",annComGroTop.getAnnid()); queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId()); queryWrapper.eq("ann_com_p",annComGroTop.getAnnComP()); queryWrapper.eq("topid",annComGroTop.getTopid()); + queryWrapper.eq("userid",sysUser.getId()); Page page = new Page(pageNo, pageSize); IPage pageList = expScoreService.page(page, queryWrapper); for (int k = 0 ; k < pageList.getRecords().size();k++){ diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java index 8941f315..315dbc5f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java @@ -48,4 +48,11 @@ public class UserHomePageController { Map result = homePageService.report4School(); return Result.ok(result); } + + @ApiOperation(value = "河南机电-部门综合报告", notes = "河南机电-部门综合报告") + @GetMapping(value = "/report4Depart") + public Result report4Depart(String orgCode) { + Map result = homePageService.report4Depart(orgCode); + return Result.ok(result); + } } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java index 6a676b5b..25648040 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java @@ -392,12 +392,11 @@ public class UserHomePageServiceImpl implements UserHomePageService { } else { countMap.put("已完成比赛比率", 0); } + resultMap.putAll(countMap); List evaluationCollects = iPersonalAbilityEvaluationCollectService - .list(new LambdaQueryWrapper() - .orderByDesc(PersonalAbilityEvaluationCollect::getCreateTime) - .last(" limit 60")); - resultMap.put("前60名学生能力值", evaluationCollects); + .list(new LambdaQueryWrapper()); +// resultMap.put("前60名学生能力值", evaluationCollects); List vos = new LinkedList<>(); Map> capacityIdListMap = Optional.ofNullable(evaluationCollects).orElse(new LinkedList<>()).stream() @@ -416,7 +415,7 @@ public class UserHomePageServiceImpl implements UserHomePageService { vo.setCapacityName(departAbilityEvaluationList.get(0).getCapacityName()); vos.add(vo); }); - resultMap.put("前60名学生能力平均值", vos); + resultMap.put("学生能力平均值", vos); List> abilityList = new LinkedList<>(); List years = DateUtils.getLastxYear(2); @@ -635,13 +634,12 @@ public class UserHomePageServiceImpl implements UserHomePageService { } else { countMap.put("已完成比赛比率", 0); } + resultMap.putAll(countMap); List evaluationCollects = iPersonalAbilityEvaluationCollectService .list(new LambdaQueryWrapper() - .eq(PersonalAbilityEvaluationCollect::getDepetId, departId) - .orderByDesc(PersonalAbilityEvaluationCollect::getCreateTime) - .last(" limit 60")); - resultMap.put("前60名学生能力值", evaluationCollects); + .eq(PersonalAbilityEvaluationCollect::getDepetId, departId)); +// resultMap.put("学生综合能力值分析", evaluationCollects); List vos = new LinkedList<>(); Map> capacityIdListMap = Optional.ofNullable(evaluationCollects).orElse(new LinkedList<>()).stream() @@ -660,7 +658,7 @@ public class UserHomePageServiceImpl implements UserHomePageService { vo.setCapacityName(departAbilityEvaluationList.get(0).getCapacityName()); vos.add(vo); }); - resultMap.put("前60名学生能力平均值", vos); + resultMap.put("学生能力平均值", vos); List> abilityList = new LinkedList<>(); List years = DateUtils.getLastxYear(2); @@ -852,22 +850,4 @@ public class UserHomePageServiceImpl implements UserHomePageService { return map; } - List getCompList() { - List annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper() - .eq(AnnualCompPoint::getRequireApply, "Y")); - List compVoList = new LinkedList<>(); - Optional.ofNullable(annualCompPointList).orElse(new LinkedList<>()).stream().forEach(p -> { - CompVo compVo = new CompVo(); - BeanUtils.copyProperties(p, compVo); - List list = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper() - .eq(AnnualCompetitionProjectRegistration::getAnnualCompid, p.getId())); - if (!ObjectUtils.isEmpty(list)) { - Set entryFormats = list.stream().map(bo -> bo.getEnrollCode()).collect(Collectors.toSet()); - Long count = iTeamManagementService.count(new LambdaQueryWrapper().in(TeamManagement::getEnrollCode, entryFormats)); - compVo.setNumber(count.intValue()); - } - }); - return compVoList; - } - } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java index b2c57051..d412ee2b 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java @@ -273,6 +273,18 @@ public class TopicController extends JeecgController { } return Result.OK(); } + + //用于查询根据id获取的年度比赛项目 + @GetMapping(value = "/getdate") + public Result getdate(@RequestParam(name="annualCompid",required=true) String annualCompid) { + QueryWrapper queryWrapper= new QueryWrapper<>(); + queryWrapper.eq("id",annualCompid); + AnnualCompPoint annualCompPoint =annualCompPointService.getOne(queryWrapper); + return Result.OK(annualCompPoint.getObjName()); + } + + + /** * 添加 * diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts index 237e17fc..70fc989c 100644 --- a/jeecgboot-vue3-master/src/api/common/api.ts +++ b/jeecgboot-vue3-master/src/api/common/api.ts @@ -188,4 +188,19 @@ export const getOrganizingCommitteeReport = () => { return defHttp.get({ url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg' }) +} +// /user/login/homepage/report4School +// 学校综合报告 +export const getComprehensiveReport = () => { + return defHttp.get({ + url:'/user/login/homepage/report4School' + }) +} +// 部门 +// http://localhost:18083/jeecg-boot/user/login/homepage/report4Depart +export const getdepartmentReport = (params:any) => { + return defHttp.get({ + url:'/user/login/homepage/report4School', + params + }) } \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts index 0b662249..15da55c8 100644 --- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts +++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts @@ -114,15 +114,25 @@ export const formSchema: FormSchema[] = [ export const teamManagementColumns: JVxeColumn[] = [ { title: '用户', - key: 'userId', + key: 'realname', type: JVxeTypes.popup, popupCode: 'user_code', - fieldConfig: [{source: 'realname', target: 'userId'}], + fieldConfig: [ + {source: 'id', target: 'userId'}, + { source: 'realname', target: 'realname' } + ], width: '200px', placeholder: '请输入${title}', defaultValue: '', }, + + { + label: '', + field: 'userId', + component: 'Input', + show: false, + }, { title: '是否队长', key: 'captain', diff --git a/jeecgboot-vue3-master/src/views/awardpersion/AwardPersionList.vue b/jeecgboot-vue3-master/src/views/awardpersion/AwardPersionList.vue index f640d1a3..6063b520 100644 --- a/jeecgboot-vue3-master/src/views/awardpersion/AwardPersionList.vue +++ b/jeecgboot-vue3-master/src/views/awardpersion/AwardPersionList.vue @@ -11,21 +11,40 @@ dictCode="annual,annual_name,id" /> + + + + + + + + + + + + + + + + + + + + 查询 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cakeChart.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cakeChart.vue index cc131717..d838523e 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cakeChart.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cakeChart.vue @@ -6,6 +6,9 @@ import echarts from '/@/utils/lib/echarts'; import { onMounted } from 'vue'; + const props = defineProps(['data']) + console.log(props.data); + const throttle = (fn: any) => { let timer: any; return function () { @@ -20,6 +23,12 @@ }; }; onMounted(() => { + let arr:any = [] + for (const key in props.data) { + arr.push({value:props.data[key],name:key}) + } + console.log(arr,props.data); + // @ts-ignore const myChart = echarts.init(document.getElementById('cakeChart')); const option = { @@ -34,16 +43,11 @@ series: [ { - name: 'Access From', + name: '国家ABC类比赛占比', type: 'pie', radius: '60%', center:['50%','55%'], - data: [ - { value: 1048, name: '比赛一',itemStyle: {color: '#0052d9'} }, - { value: 735, name: '比赛二',itemStyle: {color: '#699ef5'} }, - { value: 580, name: '比赛三',itemStyle: {color: '#d9e1ff'} }, - // { value: 484, name: '比赛四' ,itemStyle: {color: '#0052d9'}}, - ], + data: arr, labelLine: { show: false, }, diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue index ce272e7f..535ec75b 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue @@ -6,13 +6,13 @@
能力名称
-
能力分数
-
达标情况
+
能力分数
+
-
-
{{ item.text }}
-
{{ item.max }}
-
达标
+
+
{{ item.capacityName }}
+
{{ item.value }}
+
@@ -21,10 +21,10 @@
能力分数
达标情况
-
-
{{ item.text }}
-
{{ item.max }}
-
达标
+
+
{{ item.capacityName }}
+
{{ item.value }}
+
@@ -36,60 +36,61 @@ import { SvgIcon } from '/@/components/Icon'; const props = defineProps({ - data: { + DATA: { type: Array, default: [ { - text: '前言探索', - max: 100, + capacityName: '前言探索', + value: 0, }, { - text: '奠定基础', - max: 100, + capacityName: '奠定基础', + value: 0, }, { - text: '知识分析', - max: 100, + capacityName: '知识分析', + value: 0, }, { - text: '社会责任', - max: 100, + capacityName: '社会责任', + value: 0, }, { - text: '独立思考', - max: 100, + capacityName: '独立思考', + value: 0, }, { - text: '拓宽视野', - max: 100, + capacityName: '拓宽视野', + value: 0, }, { - text: '激发兴趣', - max: 100, + capacityName: '激发兴趣', + value: 0, }, { - text: '沟通协调', - max: 100, + capacityName: '沟通协调', + value: 0, }, { - text: '设计开发', - max: 100, + capacityName: '设计开发', + value: 0, }, { - text: '研判分析', - max: 100, + capacityName: '研判分析', + value: 0, }, { - text: '创新能力', - max: 100, + capacityName: '创新能力', + value: 0, }, { - text: '团队协作', - max: 100, + capacityName: '团队协作', + value: 0, }, ], }, }); + let data = JSON.parse(props.DATA) let falg = false; const unfold = () => { const dom: any = document.querySelector('.foo_card') as Element; diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue index 8942acea..7b6c9547 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue @@ -11,12 +11,12 @@
比赛层次
参赛人数
-
-
国赛
-
全国高级计算机大赛
-
计算机算法
-
高级
-
212
+
+
{{ item.typeName }}
+
{{ item.compName }}
+
{{item.pointName}}
+
{{ item.projectLevel }}
+
{{ item.number }}
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue index bea7a15d..7a5264e7 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue @@ -10,17 +10,17 @@
比赛名称
项目名称
层次
-
奖项数量
-
数量
+
奖项名称
+ -
-
国赛
-
全国高级计算机大赛
-
计算机比赛
-
高级
-
100
- -
76
+
+
{{ item.typeName }}
+
{{ item.pointName }}
+
{{ item.compName }}
+
{{ item.projectLevel }}
+
{{ item.awardName }}
+ +
@@ -34,6 +34,8 @@ type: Array, }, }); + console.log(props.data,'1121'); + let falg = false; const unfold = () => { const dom: any = document.querySelector('.foo_card3') as Element; diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue index 6d530508..922a5b08 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue @@ -6,15 +6,15 @@
部门名称
-
参加比赛数
-
参加人数
-
队伍数
+
比赛总人数
+
个人赛人数
+
团队赛人数
-
-
机电学院
-
1212
-
1212
-
1212
+
+
{{ item.部门名称 }}
+
{{ item.比赛总人数 }}
+
{{ item.个人赛人数 }}
+
{{ item.团队赛人数 }}
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue index f4c678e8..d1fe01d0 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue @@ -10,7 +10,7 @@
积分
-
+
{{ index +1 }}
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue index 53be50a7..d06667bc 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue @@ -7,21 +7,21 @@
部门名称
-
获奖人数
-
一等奖
+
获奖人数
+
-
+
-
机电学院
-
1212
+
{{ i.部门名称 }}
+ +
{{ i.获取人数 }}
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue index de71698e..cabeb7ce 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue @@ -1,20 +1,26 @@