commit

src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java

@@ -48,6 +48,7 @@ public class FlowTodoCenterController {
                   t.displayName AS taskName,
                   t.taskState,
                   t.formKey,
+                  t.h5FormKey,
                   t.createdAt,
                   t.finishTime,
                   t.variable,
@@ -92,6 +93,7 @@ public class FlowTodoCenterController {
                   t.displayName AS taskName,
                   t.taskState,
                   t.formKey,
+                  t.h5FormKey,
                   t.createdAt,
                   t.finishTime,
                   t.variable,
@@ -115,6 +117,7 @@ public class FlowTodoCenterController {
         if (StrUtil.isNotBlank(searchKeyword)) {
             cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
         }
+        cnd.and("t.taskName", "!=", "startTask");
         cnd.desc("t.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
@@ -140,10 +143,12 @@ public class FlowTodoCenterController {
                   ins.createdAt,
                   ins.variable ->> '$.instanceName' AS instanceName,
                   GROUP_CONCAT(DISTINCT t.displayName) as taskName,
-                  cat.`name` categoryName
+                  cat.`name` categoryName,
+                  t.formKey,
+                  t.h5FormKey
                 FROM
                   wf_process_instance ins
-                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskName = 'startTask'
                   LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
                   LEFT JOIN wf_process_category cat ON cat.id = def.category
                 $condition
@@ -179,7 +184,7 @@ public class FlowTodoCenterController {
                   ins.variable,
                   ins.createdAt,
                   ins.variable ->> '$.instanceName' AS instanceName,
-                   cat.`name` categoryName
+                  cat.`name` categoryName
                 FROM
                   wf_process_instance ins
                   LEFT JOIN wf_process_define def ON def.id = ins.processDefineId

src/main/java/com/budwk/app/flow/engine/model/TaskModel.java

@@ -41,6 +41,8 @@ public class TaskModel extends NodeModel {
      */
     private String countersignCompletionCondition;
 
+    private String h5form;
+
     @Override
     public void exec(Execution execution) {
         // 执行任务节点自定义执行逻辑

src/main/java/com/budwk/app/flow/entity/ProcessTask.java

@@ -8,7 +8,6 @@ import org.nutz.dao.entity.annotation.Comment;
 import org.nutz.dao.entity.annotation.Id;
 import org.nutz.dao.entity.annotation.Table;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -66,6 +65,10 @@ public class ProcessTask extends BaseModel {
     @Column
     private String formKey;
 
+    @Comment("h5任务处理表单KEY")
+    @Column
+    private String h5FormKey;
+
     @Comment("父任务ID")
     @Column
     private Long taskParentId;

src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.vo.LabelValueVO;
@@ -31,7 +30,6 @@ import com.budwk.app.flow.service.ProcessDefineService;
 import com.budwk.app.flow.service.ProcessInstanceService;
 import com.budwk.app.flow.service.ProcessTaskService;
 import com.budwk.app.flow.vo.ProcessTaskVO;
-import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -176,6 +174,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
         processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
         processTask.setTaskType(taskModel.getTaskType().getCode());
         processTask.setFormKey(taskModel.getForm());
+        processTask.setH5FormKey(taskModel.getH5form());
         processTask.setProcessInstanceId(execution.getProcessInstanceId());
 
         // 增加是否为第一个任务节点标识
@@ -283,7 +282,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
     @Override
     public boolean isAllowed(ProcessTask task, String operator) {
         // 执行者为超级管理员或自动执行用户
-        if (AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) || FlowConst.ADMIN_ID.equalsIgnoreCase(operator) || FlowConst.AUTO_ID.equalsIgnoreCase(operator)) {
+        if (FlowConst.ADMIN_ID.equalsIgnoreCase(operator) || FlowConst.AUTO_ID.equalsIgnoreCase(operator)) {
             return true;
         }
         // 任务操作者==执行者
@@ -392,6 +391,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
             processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
             processTask.setTaskType(taskModel.getTaskType().getCode());
             processTask.setProcessInstanceId(execution.getProcessInstanceId());
+            processTask.setH5FormKey(taskModel.getH5form());
 
             // 增加是否为第一个任务节点标识
             execution.getArgs().put(FlowConst.IS_FIRST_TASK_NODE, FlowUtil.isFistTaskName(execution.getProcessModel(), taskModel.getName()));