Merge remote-tracking branch 'origin/main'

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);
 
             // 自动完成第一个申请任务

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