From a2676bbc66b4eeaaf9f3e0d2d76909cd67e5bdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Wed, 24 Jul 2024 10:10:03 +0800 Subject: [PATCH] 24 --- ...petitionProjectRegistrationController.java | 4 +-- .../ChaoseTopicPersionController.java | 7 +++- .../student/AnnualCompPointList.vue | 35 ++++++++++--------- .../components/ChaoseTopicPersionForm.vue | 3 +- 4 files changed, 28 insertions(+), 21 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 3a89a846..5ec50ad6 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 @@ -634,7 +634,7 @@ public class AnnualCompetitionProjectRegistrationController { @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result edit(@RequestBody AnnualCompetitionProjectRegistrationPage annualCompetitionProjectRegistrationPage) { //判断是否为新增，以为前端访问的也是这个页面 - if (annualCompetitionProjectRegistrationPage.getAnnualCompid().length() < 11) {//说明走的新增，判断有点儿问题 + if (annualCompetitionProjectRegistrationPage.getEnrollCode() ==null) {//说明走的新增，判断有点儿问题 annualCompetitionProjectRegistrationPage.setAnnualCompid(annualCompetitionProjectRegistrationPage.getId()); annualCompetitionProjectRegistrationPage.setId(null); String entryFormat = annualCompetitionProjectRegistrationPage.getEntryFormat(); @@ -793,7 +793,7 @@ public class AnnualCompetitionProjectRegistrationController { public Result commitApplication(String id) { AnnualCompetitionProjectRegistration compRegistration = annualCompetitionProjectRegistrationService.query().eq("id", id).one(); String enrollStatic = compRegistration.getEnrollStatic(); - if (!enrollStatic.equals("0") && !enrollStatic.equals("3")) + if (!enrollStatic.equals("1") && !enrollStatic.equals("3") && !enrollStatic.equals("4")) return Result.error("当前状态不需要提交"); compRegistration.setEnrollStatic("1"); compRegistration.setBackinfo(""); 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 ff587ece..f3bcf1b6 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 @@ -268,7 +268,12 @@ public class ChaoseTopicPersionController extends JeecgController queryWrapper = new QueryWrapper<>(); queryWrapper.eq("bmcode", enrollCode); ChaoseTopicPersion one = chaoseTopicPersionService.getOne(queryWrapper); - one.setStatus(status); + if(one.getBmcode().isEmpty()){ + ChaoseTopicPersion chaoseTopicPersion = new ChaoseTopicPersion(); + chaoseTopicPersion.setBmcode(enrollCode); + one.setStatus(status); + } + if (status.equals("3")) { one.setBlack(black); } else { diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue index 38d50570..a79e6063 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue @@ -220,21 +220,22 @@ { label: '详情', onClick: handleDetail.bind(null, record), - }, - { - label: '项目能力管理', - onClick: handleEditxmnl.bind(null, record), - }, - - { - label: '题目管理', - onClick: handleEdittopic.bind(null, record), - }, - - { - label: '比赛奖项管理', - onClick: handleEditbsjx.bind(null, record), - }, + }, + + // { + // label: '项目能力管理', + // onClick: handleEditxmnl.bind(null, record), + // }, + // + // { + // label: '题目管理', + // onClick: handleEdittopic.bind(null, record), + // }, + // + // { + // label: '比赛奖项管理', + // onClick: handleEditbsjx.bind(null, record), + // }, ]; @@ -250,12 +251,12 @@ onClick: workManage.bind(null, record), }); } - /*if (record.requireTopic === 'Y' && record.annualCompState === '2') { + if (record.requireTopic === 'Y' && record.annualCompState === '2') { actions.unshift({ label: '选题', onClick: handleSubmitandApply.bind(null, record), }); - }*/ + } return actions; } diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue b/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue index 83810fcc..76ffab6e 100644 --- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue +++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue @@ -124,7 +124,8 @@ function add(route) { edit(route); } function click1(status1) { - update({enrollCode: formData.bmcode,status:status1}) + console.log(formData) + update({enrollCode: formData.bmcode,status:status1,topicid :formData.timul}) emit('up'); } /**