..

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionApplyController.java

@@ -3,17 +3,22 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.suggestionBox.service.SuggestionBoxService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 
 @IocBean
 @At("/platform/suggestionBox2/apply")
@@ -23,11 +28,13 @@ public class SuggestionApplyController {
 
     @Inject
     private SuggestionBoxService suggestionBoxService;
+    @Inject
+    private FlowEngine flowEngine;
 
     @At("/index")
     @Ok("beetl:/platform/zhgh/dayofficework/suggestionBox/apply/index.html")
     @SaCheckLogin
-    public void index(){
+    public void index() {
 
     }
 
@@ -62,7 +69,9 @@ public class SuggestionApplyController {
                   t.taskState,
                   t.finishTime,
                   t.taskParentId,
-                  t.variable taskVariale
+                  t.variable taskVariale,
+                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
                 FROM
                   suggestion_box info
                   LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
@@ -78,5 +87,14 @@ public class SuggestionApplyController {
         return Result.success(pagination);
     }
 
+    @At
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("删除")
+    public Result delete(@Param("id") String id) {
+        suggestionBoxService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
 
 }

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java

@@ -68,12 +68,16 @@ public class SuggestionXghController {
                   t.taskState,
                   t.finishTime,
                   t.taskParentId,
-                  t.variable taskVariale
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
                 FROM
                   wf_process_task t
                   LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
                   LEFT JOIN suggestion_box info ON info.id = ins.businessNo
                   LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
@@ -86,8 +90,6 @@ public class SuggestionXghController {
             cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
         }
 
-        cnd.desc("t.createdAt");
-
         cnd.andEX("YEAR(info.submitTime)", "=", year);
         cnd.and(Cnd.likeEX("info.title", title));
 
@@ -96,6 +98,8 @@ public class SuggestionXghController {
         } else {
             cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
         sql.setCondition(cnd);
         Pagination<NutMap> pageVO = suggestionBoxService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pageVO);