..

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

@@ -20,6 +20,7 @@ import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessEventTypeEnum;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.vo.HighLightVO;
 import com.budwk.app.flow.vo.ProcessInstanceVO;
 import com.budwk.app.flow.vo.ProcessTaskVO;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -137,11 +138,23 @@ public class FlowCommonController {
         List<ProcessTaskVO> res = new ArrayList<>();
         processTaskList.forEach(processTask -> {
             ProcessTaskVO vo = BeanUtil.toBean(processTask, ProcessTaskVO.class);
+            if (vo.getTaskState().equals(ProcessTaskStateEnum.FINISHED.getCode()) && StrUtil.isNotBlank(vo.getOperator())) {
+
+            }
+
             res.add(vo);
         });
         return Result.success(res);
     }
 
+    @At
+    @SaCheckLogin
+    @ApiOperation("流程图高亮")
+    public Result instanceHighLight(@Param("instanceId") Long instanceId) {
+        HighLightVO highLightVO = flowEngine.processInstanceService().highLight(instanceId);
+        return Result.success(highLightVO);
+    }
+
     @At
     @SaCheckLogin
     @Aop(TransAop.READ_COMMITTED)
@@ -209,6 +222,7 @@ public class FlowCommonController {
     @At("/executeTask")
     @SaCheckLogin
     @ApiOperation("执行任务")
+    @Aop(TransAop.READ_COMMITTED)
     public Result executeTask(@Param("data") String param) {
         Dict args = Json.fromJson(Dict.class, param);
         Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);

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

@@ -43,7 +43,8 @@ public class FlowDefineController {
     @Ok("beetl:/platform/flow/define/preview.html")
     @SaCheckLogin
     public void preview(HttpServletRequest request) {
-        request.setAttribute("id", request.getParameter("id"));
+        request.setAttribute("defineId", request.getParameter("defineId"));
+        request.setAttribute("instanceId", request.getParameter("instanceId"));
     }
 
 

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

@@ -125,6 +125,7 @@ public class FlowDesignController {
         jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl());
         jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl());
         jsonObject.set("icon", processDesign.getIcon());
+        jsonObject.set("description", processDesign.getDescription());
         processDesign.setContent(jsonObject);
         dao.insert(processDesign);
         return Result.success();
@@ -143,6 +144,7 @@ public class FlowDesignController {
         jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl());
         jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl());
         jsonObject.set("icon", processDesign.getIcon());
+        jsonObject.set("description", processDesign.getDescription());
         processDesign.setContent(jsonObject);
         processDesignService.update(processDesign);
         return Result.success();
@@ -161,12 +163,12 @@ public class FlowDesignController {
         jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl());
         jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl());
         jsonObject.set("icon", processDesign.getIcon());
+        jsonObject.set("description", processDesign.getDescription());
         processDesign.setContent(jsonObject);
         processDesignService.update(processDesign);
         return Result.success();
     }
 
-
     @At
     @SaCheckLogin
     @ApiOperation("删除流程设计")