From f7b1467d3dd3fca99f9c2de3d0c918905bbab956 Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Fri, 26 Jul 2024 14:55:36 +0800 Subject: [PATCH] =?UTF-8?q?26-=E5=8A=9F=E8=83=BD-=E5=A5=96=E9=A1=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompAwardController.java | 1 + .../controller/CompskillController.java | 20 +++++++++----- .../src/router/routes/index.ts | 8 +++--- .../depart/DepartAbilityEvaluation.data.ts | 6 +++-- .../committee/AnnualCompPointList.vue | 2 +- .../committee/AnnualCompPoint_menu_insert.sql | 26 ------------------- .../components/AnnualCompPointForm.vue | 2 +- .../AnnualCompPoint_menu_insert.sql | 26 ------------------- .../annualcompaward/AnnualCompAwardList.vue | 2 +- .../AnnualCompAward_menu_insert.sql | 26 ------------------- .../src/views/compskill/Compskill.data.ts | 18 ++++++++++--- .../src/views/compskill/CompskillList.vue | 13 +++++----- .../views/compskill/Compskill_menu_insert.sql | 26 ------------------- .../compskill/components/CompskillModal.vue | 7 ++--- .../system/usercompexpert/UserDrawer.vue | 3 +-- .../views/system/usercompexpert/user.data.ts | 17 +++++++++--- 16 files changed, 64 insertions(+), 139 deletions(-) delete mode 100644 jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint_menu_insert.sql delete mode 100644 jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint_menu_insert.sql delete mode 100644 jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAward_menu_insert.sql delete mode 100644 jeecgboot-vue3-master/src/views/compskill/Compskill_menu_insert.sql diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java index ee01aae9..c200b48a 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java @@ -94,6 +94,7 @@ public class AnnualCompAwardController extends JeecgController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(AnnualCompAward::getCreateTime); Page page = new Page(pageNo, pageSize); // 查询所属当前登录用户数据 if (containsEfficientRole) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java index 1f2d530a..2d20780a 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java @@ -90,7 +90,7 @@ public class CompskillController extends JeecgController roleList = iSysUserRoleService.getUserRoleByUserId(loginUser.getId()); Map roleMap = Optional.ofNullable(roleList).orElse(new LinkedList<>()).stream().collect(Collectors.toMap(SysRole::getRoleCode, SysRole::getRoleCode)); - //角色编码 管理员&组委会&教务处 可以看到所有，其它用户可见到所属自己数据 + //角色编码 管理员&组委会&学校管理员 可以看到所有，其它用户可见到所属自己数据 Map efficientRoleMap = new LinkedHashMap<>(); efficientRoleMap.put("admin", "admin"); efficientRoleMap.put("committee", "committee"); @@ -98,9 +98,9 @@ public class CompskillController extends JeecgController queryWrapper = new LambdaQueryWrapper<>(); // 查询所属当前登录用户数据 - if (!efficientRoleMap.containsValue(roleMap.get("admin")) - && !efficientRoleMap.containsValue(roleMap.get("committee")) - && !efficientRoleMap.containsValue(roleMap.get("superAdmin"))) { + if (efficientRoleMap.containsValue(roleMap.get("admin")) + || efficientRoleMap.containsValue(roleMap.get("committee")) + || efficientRoleMap.containsValue(roleMap.get("superAdmin"))) { List compList = iCompService.list(new LambdaQueryWrapper().eq(Comp::getCompAdmin, loginUser.getUsername())); if (!ObjectUtils.isEmpty(compList)) { Set compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet()); @@ -133,7 +133,13 @@ public class CompskillController extends JeecgController basicsskillList= basicsskillService.query().eq("id", compskill1.getCapacityid()).list(); + Basicsskill basicsskill=null; + if(basicsskillList.size()>0) + { + basicsskill=basicsskillList.get(0); + } + if (annualCompPoint != null && basicsskill != null && annualComp != null && annual != null) { compskill1.setAnnucompid(annualCompPoint.getObjName()); compskill1.setCapacityid(basicsskill.getName()); @@ -157,14 +163,14 @@ public class CompskillController extends JeecgController add(@RequestBody Compskill compskill) { - if (compskill != null) { + /* if (compskill != null) { AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("obj_name", compskill.getAnnucompid()).one(); Basicsskill basicsskill = basicsskillService.query().eq("name", compskill.getCapacityid()).one(); if (annualCompPoint != null && basicsskill != null) { compskill.setAnnucompid(annualCompPoint.getId()); compskill.setCapacityid(basicsskill.getId()); } - } + }*/ compskillService.save(compskill); return Result.OK("添加成功！"); } diff --git a/jeecgboot-vue3-master/src/router/routes/index.ts b/jeecgboot-vue3-master/src/router/routes/index.ts index 23e65368..eb35dc67 100644 --- a/jeecgboot-vue3-master/src/router/routes/index.ts +++ b/jeecgboot-vue3-master/src/router/routes/index.ts @@ -95,7 +95,7 @@ export const compcom = { title:'年度比赛项目', }, children:[ - { + /* { path:'annualcompaward', name:'annualcompaward', component: ()=> import('/@/views/annualcompaward/AnnualCompAwardList.vue'), @@ -103,8 +103,8 @@ export const compcom = { title:'比赛奖项管理' } - }, - { + },*/ +/* { path:'compskill', name:'compskill', component: ()=> import('/@/views/compskill/CompskillList.vue'), @@ -112,7 +112,7 @@ export const compcom = { title:'项目能力管理' } - }, + },*/ { path:'topic', name:'topic', diff --git a/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts b/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts index 525362a0..fe950756 100644 --- a/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts +++ b/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts @@ -86,7 +86,8 @@ export const formSchema: FormSchema[] = [ component: 'Input', componentProps:{ disabled: true, - } + }, + show: false }, { label: '能力值', @@ -94,7 +95,8 @@ export const formSchema: FormSchema[] = [ component: 'InputNumber', componentProps:{ disabled: true, - } + }, + show: false }, // TODO 主键隐藏字段，目前写死为ID diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index f828318d..06e125db 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -19,7 +19,7 @@ 导入报名 - 导出报名的模版 + 导入报名的模版