From 3721e72d076f7a46916ce5d8737c94c2dcb64d44 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 5 Sep 2025 14:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=8C=96=E6=B4=BB=E5=8A=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E3=80=81=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActivityCultureApplyActivityController.java      |  3 +--
 .../service/impl/ActivityCultureServiceImpl.java     |  2 +-
 .../zhgh/activity/culture/common/applyActivity.js    | 12 +++++++-----
 .../zhgh/activity/culture/common/infoMange.js        |  8 ++++++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java
index 67fd8116..6594ad30 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java
@@ -146,6 +146,7 @@ public class ActivityCultureApplyActivityController {
     @SaCheckLogin
     @ApiOperation("重新提交申请")
     @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR)
     public Result submitAgain(@Param("data") ActivityTissue tissue, @Param("taskId") Long taskId) {
         if (tissue.getActivity_type() == 40002) {
             tissue.setUnionId(SecurityUtil.getUnionId());
@@ -154,12 +155,10 @@ public class ActivityCultureApplyActivityController {
         tissue.setApplyTime(DateUtil.now());
         activityCultureService.insertOrUpdate(tissue);
 
-        if (tissue.getActivity_type() == 40002 || tissue.getActivity_type() == 40003){
             Dict dict = Dict.create();
             dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
             dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
             flowCommonService.executeTask(dict);
-        }
         return Result.success();
     }
 
diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
index 13f32ea7..2a387545 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
@@ -139,7 +139,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
         } else {
             cnd.desc("tissue.startTime");
         }
-
+        //cnd.groupBy("tissue.id");
         sql.setCondition(cnd);
         return this.listPageMap(page.getPageNumber(), page.getPageSize(), sql);
     }
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
index 2b1003d1..b855af36 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
@@ -529,8 +529,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
     data() {
         return {
 
-            bizId: GetQueryString("bizId"),
-            taskId: GetQueryString("taskId"),
+            bizId: "",
+            taskId: "",
             activeName: "1",
             pageForm: {
                 year: new Date().getFullYear() + ""
@@ -695,7 +695,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                 }
                 this.$axios.post('/platform/activity/culture/applyActivity/submitAgain', {
                     data: JSON.stringify(formData),
-                    taskId: GetQueryString("taskId")
+                    taskId: this.taskId
                 }).then(res => {
                     if (res.code === 0) {
                         this.$message.success("提交成功")
@@ -915,9 +915,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                 }
             }
         },
-        openEdit(id) {
+        openEdit(row) {
+            this.taskId=row.startTaskId
+            this.bizId=row.id
             this.activeName = "1"
-            this.init(id)
+            this.init(row.id)
         }
     },
     async created() {
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
index 3678538d..bcf510f9 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
@@ -101,9 +101,11 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                                                           :disabled="row.projectTypeCode==50004">
                                             编辑
                                         </el-dropdown-item>
-                                        <el-dropdown-item v-if="row.canRevoke" @click="onRevoke(row)">
+                                        <el-dropdown-item  
+                                         v-if="row.canRevoke" :command="{type:'Revoke',row}">
                                             撤回
                                         </el-dropdown-item>
+
                                         <el-dropdown-item :command="{type:'delete',row}"
                                         v-if="row.taskKey === 'startTask' || !row.instanceId" >
                                             删除
@@ -193,6 +195,8 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                 this.onView(row)
             } else if (type === "edit") {
                 this.openEdit(row)
+            }else if (type === "Revoke") {
+                this.onRevoke(row)
             } else if (type === "delete") {
                 this.doDelete(row)
             } else if (type === "openCode") {
@@ -208,7 +212,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
         },
         openEdit(row) {
             this.$refs.guava.edit(() => {
-                this.$refs.applyActivity.openEdit(row.id)
+                this.$refs.applyActivity.openEdit(row)
             })
         },
         onView(row) {