..

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalApplyControllerX.java

@@ -0,0 +1,108 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+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.proposal.models.ProposalInfo;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
+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/proposal/apply")
+@Ok("json:full")
+@Api("撰写提案")
+public class ProposalApplyControllerX {
+
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private ProposalWriteService proposalWriteService;
+
+    @At("/index")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/index.html")
+    @SaCheckLogin
+    public void index() {
+
+    }
+
+    @At("/form")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/apply/form.html")
+    @SaCheckLogin
+    public void form() {
+    }
+
+    @At
+    @SaCheckLogin
+    public Result pageData(Integer pageNumber, Integer pageSize) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  type.name AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  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
+                  proposal_info info
+                  LEFT JOIN proposal_type type on type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                  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.createdAt");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = proposalWriteService.listPageMap(pageNumber, pageSize, sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckLogin
+    public Result info(String id) {
+        ProposalInfo info = proposalWriteService.fetch(id);
+        return Result.success(info);
+    }
+
+
+    @At
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    @ApiOperation("删除")
+    public Result delete(@Param("id") String id) {
+        proposalWriteService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java

@@ -1,14 +1,18 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
+import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.bpm.param.BpmTaskApprovalParam;
 import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
@@ -26,11 +30,13 @@ import org.nutz.dao.util.cri.Static;
 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;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 团长审核
@@ -42,99 +48,78 @@ import javax.validation.Valid;
 @Api(tags = "提案-办理-团长审核")
 public class ProposalDelegationController {
 
-    @Inject
-    private BaseService baseService;
     @Inject
     private ProposalCommonService proposalCommonService;
-    @Inject
-    private ProposalDelegationService proposalDelegationService;
-    @Inject
-    private BpmService bpmService;
 
-    @At("")
+    @At("/index")
     @Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/index.html")
-    @SaCheckPermission("proposal.delegation")
+    @SaCheckLogin
     public void index() {
+
+    }
+
+    @At("/form")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/delegation/form.html")
+    @SaCheckLogin
+    public void form() {
     }
 
     @At
-    @SaCheckPermission("proposal.delegation")
-    @ApiOperation("分页列表")
-    public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) {
+    @SaCheckPermission("proposal.seconded")
+    @SaCheckLogin
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
         Sql sql = Sqls.create("""
-                SELECT
-                	info.*,
-                	type.name AS typeName,
-                	tcs.fullName AS sessionName,
-                	tcd.`name` AS delegationName,
-                	inst.id processInstanceId,
-                	inst.processInstanceNodeId,
-                	inst.processInstanceNodeName,
-                	inst.processInstanceTaskIds,
-                	inst.processInstanceStatus,
-                	task.id processInstanceTaskId,
-                	task.taskStatus processInstanceTaskStatus,
-                	EXISTS (
-                         SELECT 1
-                         FROM bpm_process_task next_task
-                         WHERE next_task.prevTaskId = task.id
-                         AND next_task.taskStatus = 'COMPLETE'
-                   ) AS nextTaskIsComplete
+                 SELECT
+                  info.*,
+                  type.name AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariale,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
                 FROM
-                	bpm_process_task task
-                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
-                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
-                	INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
-                    LEFT JOIN proposal_type type on type.id = info.typeId
-                	LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
-                	LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                  LEFT JOIN proposal_type type on type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                  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();
-        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
-            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
-        }
-        cnd.and("nd.nodeCode", "=", 30);
+        cnd.and("t.taskName", "=", "93d5ba64-8220-4e62-9783-83422f474b36");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
         if (approval) {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
-            cnd.groupBy("info.id");
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
         } else {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
         }
-        ProposalSearchParam.buildSearch(cnd, pageForm);
-        cnd.and(new Static("""
-                NOT EXISTS(
-                    SELECT 1
-                    FROM bpm_process_task t2
-                    WHERE t2.processInstanceId = task.processInstanceId
-                    AND t2.processTaskNodeCode = task.processTaskNodeCode
-                    AND t2.createdOn > task.createdOn
-                )
-                """));
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
         sql.setCondition(cnd);
-        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
-        return Result.success(pagination);
-    }
-
-    @At
-    @SaCheckPermission("proposal.delegation")
-    @Aop(TransAop.READ_COMMITTED)
-    @SLog(tag = "提案", msg = "团长审核")
-    @ApiOperation("审核")
-    public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
-        proposalDelegationService.approval(approvalParam);
-        return Result.success();
-    }
-
-    @At
-    @SaCheckPermission("proposal.delegation")
-    @Aop(TransAop.READ_COMMITTED)
-    @SLog(tag = "提案", msg = "团长审核撤回")
-    @ApiOperation("撤回")
-    public Result revoke(@Valid String taskId) {
-        proposalDelegationService.revokeTask(taskId);
-//        bpmService.revokeTask(taskId);
-        return Result.success();
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
     }
 
 }

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalInviteController.java

@@ -0,0 +1,150 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.transact;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
+import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+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 javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/proposal/invite")
+@Ok("json:full")
+@Api("邀请附议人")
+public class ProposalInviteController {
+
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private ProposalCommonService proposalCommonService;
+
+    @At("/index")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/invite/index.html")
+    @SaCheckLogin
+    public void index() {
+
+    }
+
+    @At("/form")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/invite/form.html")
+    @SaCheckLogin
+    public void form() {
+    }
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    @SaCheckLogin
+    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
+        Sql sql = Sqls.create("""
+                 SELECT
+                  info.*,
+                  type.name AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariale,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  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 proposal_info info ON info.id = ins.businessNo
+                  LEFT JOIN proposal_type type on type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                  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();
+        cnd.and("t.taskName", "=", "85b7b9bd-d706-48cb-99a1-ef1370fb1819");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+
+    @At
+    @SaCheckPermission("proposal.seconded")
+    @SaCheckLogin
+    @ApiOperation("查询附议人")
+    public Result listSeconder(@Valid PageForm pageForm, @Valid String proposalId, @Valid String sessionId,
+                               String delegationId, boolean isInvite){
+        Sql sql = Sqls.create("""
+                    SELECT
+                        t1.userId,
+                    	t1.loginName,
+                    	t1.userName,
+                    	t1.sex,
+                    	t1.unitName,
+                    	t1.unionName,
+                    	t2.NAME AS delegationName
+                    FROM
+                    	teacher_congress_delegate t1
+                    	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                    $condition
+                    """);
+        Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId);
+        cnd.andEX("t1.delegationId", "=", delegationId);
+        cnd.and("t1.roleId","=","72e24b5b4c4f4e90a6641e6af8487e42");
+        cnd.and("t1.loginName", "!=", SecurityUtil.getUserLoginname());
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("t1.loginName", pageForm.getSearchKeyword());
+            seg.orLike("t1.userName", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java

@@ -1,19 +1,23 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
+import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.bpm.param.BpmTaskApprovalParam;
 import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.proposal.controller.vo.ProposalInfoPageVO;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalSecondedService;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
 import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,11 +31,13 @@ import org.nutz.dao.util.cri.Static;
 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;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 附议提案
@@ -46,84 +52,76 @@ public class ProposalSecondedController {
     @Inject
     private Dao dao;
     @Inject
-    private BaseService baseService;
-    @Inject
     private ProposalCommonService proposalCommonService;
-    @Inject
-    private BpmService bpmService;
-    @Inject
-    private ProposalSecondedService proposalSecondedService;
 
-
-    @At("")
+    @At("/index")
     @Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/index.html")
     @SaCheckPermission("proposal.seconded")
     public void index() {
     }
 
+    @At("/form")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/seconded/form.html")
+    @SaCheckPermission("proposal.seconded")
+    public void form() {
+    }
+
+
     @At
     @SaCheckPermission("proposal.seconded")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
         Sql sql = Sqls.create("""
-                SELECT
-                	info.*,
-                	type.name AS typeName,
-                	tcs.fullName AS sessionName,
-                	tcd.`name` AS delegationName,
-                	inst.id processInstanceId,
-                	inst.processInstanceNodeId,
-                	inst.processInstanceNodeName,
-                	inst.processInstanceTaskIds,
-                	inst.processInstanceStatus,
-                	task.id processInstanceTaskId,
-                	task.taskStatus processInstanceTaskStatus,
-                	JSON_EXTRACT( task.createVariable, '$.userName' ) AS seconderName,
-                	COUNT( nt.id ) OVER ( PARTITION BY task.id ) > 0 AS nextTaskIsComplete 
+                 SELECT
+                  info.*,
+                  type.name AS typeName,
+                  tcs.fullName AS sessionName,
+                  tcd.`name` AS delegationName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariale,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
                 FROM
-                	bpm_process_task task
-                	INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId
-                	INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId
-                	INNER JOIN proposal_info info ON info.id = inst.processInstanceBusinessId
-                    LEFT JOIN proposal_type type on type.id = info.typeId
-                	LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
-                	LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
-                	LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE'
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                  LEFT JOIN proposal_type type on type.id = info.typeId
+                  LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
+                  LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
+                  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();
-        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
-            cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
-        }
-        cnd.and("nd.nodeCode", "=", 20);
-        if (approval) {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE);
-        } else {
-            cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE);
-        }
-        ProposalSearchParam.buildSearch(cnd, pageForm);
-//        cnd.and(new Static("""
-//                NOT EXISTS(
-//                    SELECT 1
-//                    FROM bpm_process_task t2
-//                    WHERE t2.processInstanceId = task.processInstanceId
-//                    AND t2.processTaskNodeCode = task.processTaskNodeCode
-//                    AND t2.createdOn > task.createdOn
-//                )
-//                """));
-//        cnd.groupBy("task.id");
-        sql.setCondition(cnd);
-        Pagination pagination = baseService.listPageVO(pageForm, sql, ProposalInfoPageVO.class);
-        return Result.success(pagination);
-    }
+        cnd.and("t.taskName", "=", "74458b33-ad6e-46c4-b8d9-1aa897142b25");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
 
-    @At
-    @SaCheckPermission("proposal.seconded")
-    @ApiOperation("附议")
-    @Aop(TransAop.READ_COMMITTED)
-    @SLog(tag = "提案", msg = "提案人附议")
-    public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
-        proposalSecondedService.approval(approvalParam);
-        return Result.success();
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createdAt");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = proposalCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
     }
 
 }

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/view/ProposalViewController.java

@@ -0,0 +1,37 @@
+package com.budwk.app.zhgh.democratic.proposal.controller.view;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import io.swagger.annotations.Api;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+@IocBean
+@At("/platform/proposal/view")
+@Ok("json:full")
+@Api("提案查看")
+public class ProposalViewController {
+
+    @Inject
+    private Dao dao;
+
+    @At("/index")
+    @SaCheckLogin
+    @Ok("beetl:/platform/zhgh/democratic/proposal/view/index.html")
+    public void index(){
+
+    }
+
+    @At("/info")
+    @SaCheckLogin
+    public Result info(String id) {
+        ProposalInfo info = dao.fetch(ProposalInfo.class, id);
+        return Result.success(info);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalApplyInterceptor.java

@@ -0,0 +1,30 @@
+package com.budwk.app.zhgh.democratic.proposal.interceptor;
+
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+
+/**
+ * 提案申请拦截器
+ */
+public class ProposalApplyInterceptor implements FlowInterceptor {
+    @Override
+    public void intercept(Execution execution) {
+        String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
+        ProposalInfo info = Json.fromJson(ProposalInfo.class, formDataStr);
+
+        Dao dao = ServiceContext.find(Dao.class);
+        dao.insertOrUpdate(info);
+        execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(info));
+
+        int instanceId = execution.getArgs().getInt(FlowConst.PROCESS_INSTANCE_ID_KEY);
+        dao.update(ProcessInstance.class, Chain.make("businessNo", info.getId()), Cnd.where(ProcessInstance::getId, "=", instanceId));
+    }
+}