24

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<String> 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<String> 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("");

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<ChaoseTopicPer
         QueryWrapper<ChaoseTopicPersion> 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 {

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;
   }

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');
 }
 /**