..

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

@@ -57,7 +57,7 @@ public class SuggestionBoxMineController {
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
-                  ins.variable instanceVariale,
+                  ins.variable instanceVariable,
                   ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,
@@ -67,7 +67,7 @@ public class SuggestionBoxMineController {
                   t.taskState,
                   t.finishTime,
                   t.taskParentId,
-                  t.variable taskVariale,
+                  t.variable taskVariable,
                   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' AND taskState in (10,20)) AS startTaskId
                 FROM

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

@@ -0,0 +1,99 @@
+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.Dao;
+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/suggestionBox/query")
+@Ok("json:full")
+@Api("意见箱-查询统计")
+public class SuggestionBoxQueryController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private SuggestionBoxService suggestionBoxService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/democratic/suggestionBox/query/index.html")
+    @SaCheckLogin
+    public void index() {
+
+    }
+
+
+    @At
+    @SaCheckLogin
+    public Result pageData(Integer pageNumber, Integer pageSize) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.id,
+                  info.title,
+                  info.userName,
+                  info.loginName,
+                  info.unitName,
+                  info.unionName,
+                  info.submitTime,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                  suggestion_box info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+        cnd.desc("info.submitTime");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql);
+        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/SuggestionBoxWriteController.java

@@ -8,11 +8,14 @@ import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -31,6 +34,8 @@ public class SuggestionBoxWriteController {
     private Dao dao;
     @Inject
     private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
 
     @At("")
     @Ok("beetl:/platform/zhgh/democratic/suggestionBox/write/index.html")
@@ -67,6 +72,20 @@ public class SuggestionBoxWriteController {
         return Result.success();
     }
 
+    @At
+    @SaCheckLogin
+    @ApiOperation("重新提交申请")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result submitAgain(@Param("data") SuggestionBox suggestionBox, @Param("taskId") Long taskId) {
+        dao.insertOrUpdate(suggestionBox);
+
+        Dict dict = Dict.create();
+        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        flowCommonService.executeTask(dict);
+        return Result.success();
+    }
+
 
     @At
     @SaCheckLogin

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

@@ -52,7 +52,7 @@ public class SuggestionXghController {
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
-                  ins.variable instanceVariale,
+                  ins.variable instanceVariable,
                   ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,