--计划增加多个执行字段

zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue

@@ -424,7 +424,10 @@
         let formValues = resData.formValues;
         let formUrlparval = formValues.dataId;
         let formUrlpar = formValues.dataName;
-        formUrl.value = flowForm.formUrl + '?' + formUrlpar + '=' + formUrlparval;
+        const connector = flowForm.formUrl.includes('?') ? '&' : '?';
+        formUrl.value = flowForm.formUrl + connector + formUrlpar + '=' + formUrlparval;
+        //formUrl.value = flowForm.formUrl + '?' + formUrlpar + '=' + formUrlparval;
+         console.error('表单url:', formUrl.value);
       }
       formError.value = false;
     } catch (error) {

zrch-risk-client-39/src/views/project/plan/components/StPlanExcuteForm.vue

@@ -65,6 +65,8 @@
   const resetForm = () => {
     formRef.value.resetFields();
   };
+
+  // 1 接收 id 2  保存调用  StPlanMan.api 的 saveOrUpdate
 </script>
 
 <style scoped></style>

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

 package org.jeecg.modules.flowable.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.flowable.domain.dto.FlowProcDefDto;
@@ -8,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -105,4 +107,5 @@ public interface IFlowDefinitionService {
      * @return
      */
     public Result startProcessInstanceByDeployId(String DeployId, Map<String, Object> variables);
+    public List<UserTask> taskList(String deployId);
 }

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

@@ -170,7 +170,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     myTask.setUid(approvalId);
                     myTask.setTp(5);
                     myTask.setTarget(nextTask.getName());
-                    myTask.setTargetId(zdval); //zdval
+                    if(zdval!=null&&!zdval.equals("")){
+                        myTask.setTargetId(zdval); //zdval
+                    }
+
                     myTask.setStTime(new Date());
                     myTask.setTaskName("待处理");
                     myTask.setName(nextTask.getName());
@@ -178,7 +181,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     myTask.setPriority("M");
                     myTask.setDes("");
                     //myTask.setLinkAddr("/project/plan/StPlanManList?"+zdmc+"="+zdval);
-                    myTask.setLinkAddr(sysForm.getFormListurl());
+                    if(sysForm!=null){
+                        myTask.setLinkAddr(sysForm.getFormListurl());
+                    }
+
                     myTaskService.save(myTask);
 
                     // 4. 根据流程定义ID查询流程定义对象
@@ -197,7 +203,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     taskFlow.setProcDefId(nextTask.getProcessDefinitionId());
                     taskFlow.setProcInsId(nextTask.getProcessInstanceId());
                     taskFlow.setExecutionId(nextTask.getExecutionId());
-                    taskFlow.setTargetId(zdval);
+                    if(zdval!=null&&!zdval.equals("")){
+                        taskFlow.setTargetId(zdval);
+                    }
+
                     taskFlow.setDeployId(deploymentId);
                     taskFlow.setFormTableName(sysForm.getFormTableName());
                     taskFlow.setUid(approvalId);

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/plan/main/entity/StPlanMan.java

@@ -150,5 +150,35 @@ public class StPlanMan implements Serializable {
 	/**处理人id*/
 	private java.lang.String uid;
 
+	/**执行人*/
+	@Excel(name = "执行人", width = 15)
+	private java.lang.String exeUid;
+	/**执行操作时间*/
+	@Excel(name = "执行操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date exeTime;
+	/**执行状态*/
+	@Excel(name = "执行状态", width = 15)
+	private java.lang.String executeStatus;
+	/**实际开始时间*/
+	@Excel(name = "实际开始时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private java.util.Date actualStartTime;
+	/**实际结束时间*/
+	@Excel(name = "实际结束时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private java.util.Date actualEndTime;
+	/**执行记录*/
+	@Excel(name = "执行记录", width = 15)
+	private java.lang.String executeEcord;
+	/**执行附件*/
+	@Excel(name = "执行附件", width = 15)
+	private java.lang.String attachments;
+
+
+
 
 }