From 46ab1d1a08d203791b8b33a64f794c33bc00d091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Tue, 30 Jul 2024 14:30:01 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 10 ++++++++++ .../src/locales/lang/zh-CN/sys.ts | 1 + .../src/views/system/loginmini/MiniRegister.vue | 14 +++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 1af4c42d..a0e964ec 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1145,6 +1145,7 @@ public class SysUserController { String departmentid = jsonObject.getString("departmentid"); String realname = jsonObject.getString("realname"); String checkKey = jsonObject.getString("checkKey"); + String workon = jsonObject.getString("workno"); if(captcha==null){ result.error500("验证码无效"); @@ -1187,6 +1188,14 @@ public class SysUserController { result.setSuccess(false); return result; } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("work_no", workon); + List sysUser3 = sysUserService.list(queryWrapper); + if (sysUser3.size()>0) { + result.setMessage("该学号/工号已注册"); + result.setSuccess(false); + return result; + } if(oConvertUtils.isEmpty(realname)){ realname = username; @@ -1198,6 +1207,7 @@ public class SysUserController { String passwordEncode = PasswordUtil.encrypt(username, password, salt); user.setSalt(salt); user.setUsername(username); + user.setWorkNo(workon); user.setRealname(realname); user.setPassword(passwordEncode); //user.setEmail(email); diff --git a/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts b/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts index 6d020b7c..f37df5c2 100644 --- a/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts +++ b/jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts @@ -60,6 +60,7 @@ export default { placeholder: '请输入锁屏密码或者用户密码', }, login: { + workno: '工号/学号', backSignIn: '返回', signInFormTitle: '登录', mobileSignInFormTitle: '手机登录', diff --git a/jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue b/jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue index ba2d25c0..6df31a98 100644 --- a/jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue +++ b/jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue @@ -27,6 +27,12 @@ + +
+ + +
+
@@ -137,6 +143,7 @@ const formRef = ref(); const formData = reactive({ username: '', + workno: '', mobile: '', smscode: '', password: '', @@ -228,6 +235,10 @@ const randCodeData = reactive({ createMessage.warn(t('sys.login.passwordPlaceholder')); return; } + if (!formData.workno) { + createMessage.warn(t('sys.login.passwordPlaceholder')); + return; + } if (!formData.confirmPassword) { createMessage.warn(t('sys.login.confirmPassword')); return; @@ -250,6 +261,7 @@ const randCodeData = reactive({ try { const resultInfo = await registerStu( toRaw({ + workno: formData.workno, username: formData.username, departmentid: formData.department, realname: formData.realname, @@ -286,7 +298,7 @@ const randCodeData = reactive({ * 初始化表单 */ function initForm() { - Object.assign(formData, { username: '', mobile: '', realname: '', department: '', smscode: '', password: '', confirmPassword: ''/*, policy: false*/ }); + Object.assign(formData, { workno: '', username: '', mobile: '', realname: '', department: '', smscode: '', password: '', confirmPassword: ''/*, policy: false*/ }); if (!unref(timer)) { showInterval.value = true; clearInterval(unref(timer)); From c3eb31e9ad74b8881db2aa9db359d99ec60d60a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Tue, 30 Jul 2024 14:52:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E6=9C=AA=E5=90=AF=E5=8A=A8=E8=BF=98=E5=8F=AF=E4=BB=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AnnualCompPointServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java index 5b4ef54d..233a316d 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java @@ -83,6 +83,10 @@ public class AnnualCompPointServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); From 69240db3316cf7fc4ad4307976fba03878011913 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Tue, 30 Jul 2024 15:07:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=207.30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depart/DepartAbilityEvaluation.data.ts | 4 ++-- .../departCompTotalScore/DepartCompTotalScore.data.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 fe950756..9e10be25 100644 --- a/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts +++ b/jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts @@ -29,7 +29,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'depetId', component: 'JDictSelectTag', componentProps: { - dictCode: "sys_depart,depart_name,id" + dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'" }, colProps: {span: 6}, }, @@ -59,7 +59,7 @@ export const formSchema: FormSchema[] = [ field: 'depetId', component: 'JDictSelectTag', componentProps: { - dictCode: "sys_depart,depart_name,id" + dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'" }, dynamicRules: ({model, schema}) => { return [ diff --git a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts index 48b3b3f4..eeda545d 100644 --- a/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts +++ b/jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts @@ -42,7 +42,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'depet', component: 'JDictSelectTag', componentProps:{ - dictCode:"sys_depart,depart_name,id" + dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'" }, colProps: {span: 6}, }, @@ -63,7 +63,9 @@ export const formSchema: FormSchema[] = [ field: 'depet', component: 'JDictSelectTag', componentProps:{ - dictCode:"sys_depart,depart_name,id" + dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'" + // dictCode: "sys_user,realname,id,username!='admin' order by create_time", + }, dynamicRules: ({model,schema}) => { return [ From 863345ee917ec2379fd08e51ee748db7bb11b9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Tue, 30 Jul 2024 15:15:56 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=80=9A=E8=BF=87=E5=90=8E=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompPointController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 9c5444f6..1c33d0e2 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 @@ -304,7 +304,12 @@ public class AnnualCompPointController extends JeecgController edit(@RequestBody AnnualCompPoint annualCompPoint) { - boolean isUpdate = annualCompPointService.updateById(annualCompPoint); + boolean isUpdate ; + if(annualCompPoint.getAnnualCompState().equals("0") && annualCompPoint.getAnnualCompState().equals("4") ){ + isUpdate = annualCompPointService.updateById(annualCompPoint); + } else { + return Result.error("当前状态不可修改"); + } if (!isUpdate){ return Result.error("编辑失败!"); } @@ -322,7 +327,13 @@ public class AnnualCompPointController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { - annualCompPointService.removeById(id); + AnnualCompPoint annualCompPoint =annualCompPointService.getById(id); + if(annualCompPoint.getAnnualCompState().equals("0") && annualCompPoint.getAnnualCompState().equals("4") ) { + System.out.println(id); + annualCompPointService.removeById(id); + }else { + return Result.error("当前状态不可删除"); + } return Result.OK("删除成功!"); } /** From 7470c338f8cb5a11d1784adfb935cd02042df393 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 15:52:08 +0800 Subject: [PATCH 5/8] bug --- .../controller/AnnualCompPointController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 1c33d0e2..509acca0 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 @@ -951,8 +951,11 @@ public class AnnualCompPointController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), AnnualCompPointMb.class, params); for (int i = 0 ; i < list.size();i++){ - SysUser sysUser = sysUserService.getUserByName(list.get(i).getStudentcode()); - if(sysUser==null){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("work_no",list.get(i).getStudentcode()); + List listsys = sysUserService.list(qw); + //SysUser sysUser = sysUserService.getUserByName(list.get(i).getStudentcode()); + if(listsys.size()==0){ return Result.error("文件导入失败:第"+(i+1)+"行学生学号不存在"); } } @@ -972,7 +975,10 @@ public class AnnualCompPointController extends JeecgController qw1 = new QueryWrapper<>(); + qw1.eq("work_no",list.get(k).getStudentcode()); + List listsys1 = sysUserService.list(qw1); + tm.setUserId(listsys1.get(0).getId()); tm.setCaptain("0"); teamManagementService.save(tm); } From b029ba9777c919992bcc13761ec7d81112679d6d Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 15:53:20 +0800 Subject: [PATCH 6/8] bug --- .../controller/AwardPersionController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 1ec8927e..5b2bbbc8 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 @@ -120,7 +120,7 @@ public class AwardPersionController extends JeecgController page = new Page(pageNo, pageSize); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, req.getParameterMap()); - queryWrapper.eq("studentcode",user.getUsername()); + queryWrapper.eq("studentcode",sysUserService.getById(user.getId()).getWorkNo()); IPage pageList = awardPersionService.page(page, queryWrapper); return Result.OK(pageList); }else if(sysRoleList.get(0).getId().equals("1693451972151386114")){ @@ -224,7 +224,7 @@ public class AwardPersionController extends JeecgController Date: Tue, 30 Jul 2024 16:15:00 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=88=9B=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompPointController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 1c33d0e2..24053d0d 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 @@ -148,17 +148,24 @@ public class AnnualCompPointController extends JeecgController queryWrapperComp = new LambdaQueryWrapper<>(); // id位数相同，可用like模糊 - queryWrapperComp.like(Comp::getCompAdmin, userId); + queryWrapperComp.eq(Comp::getCompAdmin, userId); List list = compService.list(queryWrapperComp); + if(list.isEmpty()){ + return Result.error("未绑定比赛"); + } List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); // 获取负责的年度比赛id QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); - queryWrapperAnnual.in(ids.size()!=0,"compid",ids); + /*queryWrapperAnnual.in(ids.size()!=0,"compid",ids);*/ + queryWrapperAnnual.in("compid",ids); List listAnnual = annualCompService.list(queryWrapperAnnual); + if(listAnnual.isEmpty()){ + return Result.error("未创建年度比赛"); + } List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); - queryWrapper.in(annualIds.size()!=0,"annual_comp_id",annualIds); + queryWrapper.in("annual_comp_id",annualIds); queryWrapper.eq("annual_comp_switch","Y"); // 比赛必须是开启的 Page page = new Page(pageNo, pageSize); IPage pageList = annualCompPointService.page(page, queryWrapper); From 13ebba7b6fe2cb9fb5bfcfd5b9d6403eb016f2df Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Tue, 30 Jul 2024 16:38:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E9=87=8F=E5=8C=96=20=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=207.3?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annualCompPoint/committee/AnnualCompPointList.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index 09260ca0..16e1676f 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -402,6 +402,9 @@ }); } /** + * 个人积分汇总 + * 触发条件：评奖完成后操作，且更新项目状态为“积分已汇总”，并且不可再进行个人积分汇总 + * 是否已凭奖为1且未汇总过时，可以积分汇总操作 * 状态：0待提交、1已提交(待审核)、2已审核(已通过)、3待驳回、4已驳回、5-已报名、6-已选题、7-已上传作品、8-已评分、9-已评奖,10-积分已汇总 */ @@ -411,7 +414,12 @@ onClick: handleCollectScoreApply.bind(null, record), }); } - if (record.isPj == 1 ) { + + /** + * 个人能力量化 + * 触发条件：个人积分汇总完成后操作，可以重复进行个人能力量化操作 + */ + if (record.isPj == 1 && record.annualCompState == "10" ) { actions.unshift({ label: '个人能力量化', onClick: handlePersonalAbilityEvaluation.bind(null, record),