From 402499b9fd843a200487b67b2f9cd368cd5de088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Mon, 29 Jul 2024 16:17:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=BE=E5=87=BA=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student/AnnualCompetitionProjectRegistrationList.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue index 84bbfb35..4026e3ef 100644 --- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue +++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue @@ -203,6 +203,12 @@ function getTableAction(record) { label: '选题', onClick: chooseTopic.bind(null, record), }, + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + + { label: '详情', onClick: handleDetail.bind(null, record), From 81ad247aafb085b6a555b05dceed6324ca2553c6 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 29 Jul 2024 17:31:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChaoseTopicPersionController.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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); From c1402fc977945cfc919ce0a781dff7581c5bac04 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Mon, 29 Jul 2024 18:31:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=207.29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserHomePageController.java | 7 ++++ .../service/UserHomePageServiceImpl.java | 36 +++++-------------- 2 files changed, 15 insertions(+), 28 deletions(-) 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; - } - } From 428889aeca255f355827d4cb3aca9fea9c413503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Mon, 29 Jul 2024 18:39:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/controller/TopicController.java | 12 +++++++ .../src/views/topic/Topic.api.ts | 8 +++++ .../src/views/topic/components/TopicForm.vue | 31 +++++++++++++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) 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/views/topic/Topic.api.ts b/jeecgboot-vue3-master/src/views/topic/Topic.api.ts index 688d928c..700efa12 100644 --- a/jeecgboot-vue3-master/src/views/topic/Topic.api.ts +++ b/jeecgboot-vue3-master/src/views/topic/Topic.api.ts @@ -17,6 +17,7 @@ enum Api { importExcel = '/topic/topic/importExcel', exportXls = '/topic/topic/exportXls', addScoreSta = '/scoresta/scoreSta/addScoreSta', + getdate = '/topic/topic/getdate', } export const addScoreSta = (params, isUpdate) => { @@ -46,6 +47,13 @@ export const list3 = (params) => defHttp.get({url: Api.list3, params}); export const list5 = (params) => defHttp.get({url: Api.list5, params}); export const Update = (params) => defHttp.post({url: Api.edit, params}); export const select = (params) => defHttp.post({url: Api.select, params}); +/*export const getdate = (params) => defHttp.get({url: Api.getdate, params});*/ + +export const getdate = (params) => + defHttp.get({ + url: Api.getdate, + params + }); /** * 删除单个 diff --git a/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue b/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue index 9164321c..e3cb5e09 100644 --- a/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue +++ b/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue @@ -56,8 +56,14 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue'; import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue'; import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue'; import { getValueType } from '/@/utils'; -import { saveOrUpdate,select } from '../Topic.api'; +import { saveOrUpdate,select,getdate } from '../Topic.api'; import { Form } from 'ant-design-vue'; +import {useRoute} from "vue-router"; +import {demoArticleListApi} from "/@/api/demo/mainHome"; +const $Route = useRoute() +//把路由中的数据转化到组件中 + + const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -101,12 +107,32 @@ const disabled = computed(()=>{ } return props.formDisabled; }); +function routrtodate() { + const annualCompid = $Route.query.annualCompid; + formData.annualCompid = annualCompid; + console.log( formData.annualCompid,annualCompid,'111') +}; +routrtodate(); +let compName = '' +function getData() { + return new Promise((resovle,rej) => { + const annualCompid = $Route.query.annualCompid; + getdate({ annualCompid:annualCompid }).then(res => { + console.log(res,'2222') + compName = res + resovle(res) + }) + }) +}; +// getData(); /** * 新增 */ -function add() { +async function add() { +const res = await getData() + setFieldsValue({annualCompid:formData.annualCompid,annualCompid_dictText:res}) edit({}); } function change(record){ @@ -166,6 +192,7 @@ async function submitForm() { * popup组件值改变事件 */ function setFieldsValue(map) { + console.log(map) Object.keys(map).map((key) => { formData[key] = map[key]; }); From 66eb1d759667b2c1ac00658b92631aa2da78fed0 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 29 Jul 2024 18:58:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/awardpersion/AwardPersionList.vue | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) 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 ? '收起' : '展开' }} - - From fd05b03a3af31c3ce3a2a02a0953ea242f75b57d Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 29 Jul 2024 18:59:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../awardpersion/controller/AwardPersionController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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()); From 73b2edc618dc9ba9ecfc496b22157c3c9afceb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Mon, 29 Jul 2024 19:37:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...alCompetitionProjectRegistrationController.java | 2 +- .../AnnualCompetitionProjectRegistration.data.ts | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 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 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/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',