From 161b69283834885cd7e085c4a0b0ce40ac98869f Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 18 Dec 2025 13:22:38 +0800 Subject: [PATCH] commit --- .../controller/ActivityCultureApplyActivityController.java | 1 + .../controller/ActivityCultureAuditActivityController.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 afeb251..c405bc4 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 @@ -140,6 +140,7 @@ public class ActivityCultureApplyActivityController { Dict args = Dict.create(); args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.FORM_DATA, tissue); + args.set("activity_type", tissue.getActivity_type()); ProcessInstance instance = flowEngine.startProcessInstanceByKey("WHHD", tissue.getId(), SecurityUtil.getUserId(), args); // 自动完成第一个申请任务 diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index 2d8d4bc..f5828ba 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -102,7 +102,11 @@ public class ActivityCultureAuditActivityController { LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 $condition """); - cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37"); + if (activity_type==40002){ + cnd.and("t.taskName", "=", "12f7ed7d-9286-4453-8754-57df7d3b260b"); + }else{ + cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37"); + } cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(tissue.startTime)", "=", year);