--重置流程启动

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -447,13 +447,13 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
                     .singleResult();
             String procDefId="";
             if (processDefinition != null) {
-                 procDefId = processDefinition.getId();
+                procDefId = processDefinition.getId();
                 // 使用 procDefId
 
             }
 
 
-             processDefinition = repositoryService.createProcessDefinitionQuery()
+            processDefinition = repositoryService.createProcessDefinitionQuery()
                     .processDefinitionId(procDefId)
                     .singleResult();
             if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
@@ -470,7 +470,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
             Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).active().singleResult();
             result.put("deployId", DeployId);
             result.put("taskId", task.getId());
-            result.put("procInsId", task.getProcessDefinitionId());
+            result.put("procInsId", task.getProcessInstanceId());
             result.put("executionId", task.getExecutionId());
             result.put("instanceId", task.getProcessInstanceId());
 
@@ -503,19 +503,19 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
                 }
 
 
-              String tabname= flowForm.getFormTableName();
-              if(tabname!=null&&!tabname.equals("")&&zdmc!=null&&!zdmc.equals("")&&zdval!=null&&!zdval.equals("")){
-                  String formContent=zdmc+"="+zdval;
-                  FlowForm flowFormben=new FlowForm();
-                  flowFormben.setFormTableName(tabname);
-                  flowFormben.setFormContent(formContent);
-                  flowFormben.setFormTp("2");
-                  flowFormben.setFormUrl(DeployId);
-                  sysDeployFormService.updateBisTabBpmStatus(flowFormben);
+                String tabname= flowForm.getFormTableName();
+                if(tabname!=null&&!tabname.equals("")&&zdmc!=null&&!zdmc.equals("")&&zdval!=null&&!zdval.equals("")){
+                    String formContent=zdmc+"="+zdval;
+                    FlowForm flowFormben=new FlowForm();
+                    flowFormben.setFormTableName(tabname);
+                    flowFormben.setFormContent(formContent);
+                    flowFormben.setFormTp("2");
+                    flowFormben.setFormUrl(DeployId);
+                    sysDeployFormService.updateBisTabBpmStatus(flowFormben);
 
 
 
-              }
+                }
 
             }
 
@@ -603,6 +603,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
             e.printStackTrace();
             return Result.error("流程启动错误");
         }
+
     }
 
 

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -2163,7 +2163,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     .processInstanceId(procInsId)
                     .orderByHistoricTaskInstanceStartTime().asc()
                     .list();
-            String urlquerystr="";
+            String urlquerystr = "";
             // 1. 获取历史活动实例
             List<HistoricActivityInstance> activities = historyService
                     .createHistoricActivityInstanceQuery()
@@ -2177,6 +2177,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     .createHistoricProcessInstanceQuery()
                     .processInstanceId(procInsId)
                     .singleResult();
+            if(historicProcessInstance!=null){
 
             BpmnModel bpmnModel = repositoryService
                     .getBpmnModel(historicProcessInstance.getProcessDefinitionId());
@@ -2190,9 +2191,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     UserTask userTask = (UserTask) flowElement;
 
 
-
-
-
                     // 获取任务实例信息（如果有）
                     if (activity.getTaskId() != null) {
                         HistoricTaskInstance task = historyService
@@ -2204,26 +2202,26 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
                             // 获取流程变量
                             Map<String, Object> formValues = getProcessVariables(task.getId());
-                            if(formValues!=null){
+                            if (formValues != null) {
                                 // 获取流程变量
-                                String   formUrlparval="";
-                                String   formUrlpar="";
-                                if(formValues.get("dataId")==null){
-                                    if(formValues.get("_value")!=null){
-                                        Map zdv=(Map)formValues.get("_value");
-                                        formUrlpar=(String)zdv.get("dataName");
-                                        formUrlparval=zdv.get("dataId").toString();
+                                String formUrlparval = "";
+                                String formUrlpar = "";
+                                if (formValues.get("dataId") == null) {
+                                    if (formValues.get("_value") != null) {
+                                        Map zdv = (Map) formValues.get("_value");
+                                        formUrlpar = (String) zdv.get("dataName");
+                                        formUrlparval = zdv.get("dataId").toString();
                                     }
 
 
-                                }else{
-                                    formUrlparval=formValues.get("dataId").toString();
-                                    formUrlpar=formValues.get("dataName").toString();
+                                } else {
+                                    formUrlparval = formValues.get("dataId").toString();
+                                    formUrlpar = formValues.get("dataName").toString();
                                 }
 
 
-                                urlquerystr=formUrlpar+"="+formUrlparval;
-                            break;
+                                urlquerystr = formUrlpar + "=" + formUrlparval;
+                                break;
                             }
 
                         }
@@ -2233,6 +2231,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 }
             }
 
+        }
+