commit

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java

@@ -64,7 +64,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
                     SELECT
                     	gh.id,
                     	gh.name unionname,
-                    	( SELECT count( 1 ) FROM `user` WHERE id IN ( $scopeUserSql ) AND unionId = gh.id ) as teacherCount
+                    	( SELECT count( 1 ) FROM `vw_user` WHERE id IN ( $scopeUserSql ) AND unionId = gh.id ) as teacherCount
                     
                     FROM
                     	sys_union gh

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

@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
@@ -21,7 +22,9 @@ 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;
+import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -116,6 +119,15 @@ public class ProposalCaseCheckController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.caseCheck")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("caseCheck", pageForm, approval, tableColumns, response);
+    }
+
     @At
     @SaCheckPermission("proposal.caseCheck")
     @ApiOperation("查询当前提案承办单位")

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
@@ -28,6 +29,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @IocBean
@@ -114,6 +116,15 @@ public class ProposalCommitteeFilingController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.committeeFiling")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("committeeFiling", pageForm, approval, tableColumns, response);
+    }
+
     @At
     @SaCheckPermission("proposal.committeeFiling")
     @ApiOperation("并案审核")

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

@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.flow.entity.ProcessInstance;
@@ -36,6 +37,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @IocBean
@@ -127,6 +129,15 @@ public class ProposalCommitteeFilingUnitController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.committeeFilingUnit")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("committeeFilingUnit", pageForm, approval, tableColumns, response);
+    }
+
     @At
     @SaCheckPermission("proposal.committeeFilingUnit")
     @ApiOperation("执行任务")

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 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.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
@@ -32,6 +33,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -127,4 +129,13 @@ public class ProposalDelegationController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.delegation")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("delegation", pageForm, approval, tableColumns, response);
+    }
+
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
@@ -26,6 +27,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @IocBean
@@ -116,6 +118,15 @@ public class ProposalFeedbackEvaluationController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("feedbackEvaluation", pageForm, approval, tableColumns, response);
+    }
+
     @At
     @SaCheckPermission("proposal.feedbackEvaluation")
     @ApiOperation("获取立案信息")

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

@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
@@ -20,7 +21,9 @@ 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;
+import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -113,4 +116,13 @@ public class ProposalPreAuditController {
         Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(), sql);
         return Result.success(pagination);
     }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.preAudit")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("preAudit", pageForm, approval, tableColumns, response);
+    }
 }

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.vo.LabelValueVO;
 import com.budwk.app.flow.constant.FlowConst;
@@ -38,6 +39,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -144,6 +146,15 @@ public class ProposalSchoolLeaderApprovalController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("schoolLeaderApproval", pageForm, approval, tableColumns, response);
+    }
+
     @At
     @SaCheckPermission("proposal.schoolLeaderApproval")
     @ApiOperation("获取主办单位")

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

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
@@ -37,6 +38,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -170,6 +172,15 @@ public class ProposalUnderTakeReplyController {
         return Result.success(pagination);
     }
 
+    @At
+    @Ok("void")
+    @SaCheckPermission("proposal.unitReply")
+    @ApiOperation("导出列表")
+    public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
+                           @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        proposalCommonService.exportWorkflowList("unitReply", pageForm, approval, tableColumns, response);
+    }
+
     /**
      * 承办单位答复节点撤回需要基于整组当前节点判断。
      * 只有“当前流程正在办理的节点”和“这条列表记录所属节点”完全一致时，才允许撤回；

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonService.java

@@ -2,8 +2,10 @@ package com.budwk.app.zhgh.democratic.proposal.service.common;
 
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import org.nutz.dao.Cnd;
 import org.nutz.lang.util.NutMap;
 
@@ -137,6 +139,18 @@ public interface ProposalCommonService extends BaseService<ProposalInfo> {
      */
     void exportYearReport(String sessionId, HttpServletResponse response);
 
+    /**
+     * 按办理页面当前筛选条件和可见列导出提案列表。
+     *
+     * @param pageCode 页面代码，用于固定查询范围、数据权限和排序白名单
+     * @param pageForm 页面筛选条件
+     * @param approval 审核状态筛选条件
+     * @param tableColumns 当前页面可见列
+     * @param response HTTP 响应
+     */
+    void exportWorkflowList(String pageCode, ProposalSearchParam pageForm, boolean approval,
+                            ExportTableColumns[] tableColumns, HttpServletResponse response);
+
 
     /**
      * 合并提案

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -7,8 +7,13 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.base.param.ExportTableColumns;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.CommonDownloadUtil;
@@ -19,6 +24,7 @@ import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.engine.util.FlowUtil;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.vo.ProcessTaskVO;
 import com.budwk.app.sys.models.Sys_dict;
@@ -28,11 +34,13 @@ import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.sys.services.SysDictService;
 import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.web.commons.base.Globals;
 import com.budwk.app.zhgh.democratic.proposal.constants.ProposalState;
 import com.budwk.app.zhgh.democratic.proposal.models.*;
 import com.budwk.app.zhgh.democratic.proposal.param.ProposalQueryComprehensiveParam;
+import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService;
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
 import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegateService;
@@ -55,6 +63,7 @@ import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 import org.nutz.lang.util.NutMap;
+import org.apache.poi.ss.usermodel.Workbook;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
@@ -73,6 +82,9 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     /** PC端提案列表页面的排序字段白名单，页面代码由对应Controller固定传入。 */
     private static final Map<String, Map<String, String>> PROPOSAL_LIST_ORDER_COLUMNS = createProposalListOrderColumns();
 
+    /** 办理页面允许导出的列表字段，避免请求参数携带非页面字段。 */
+    private static final Map<String, Set<String>> WORKFLOW_EXPORT_COLUMNS = createWorkflowExportColumns();
+
     //找出富文本里面上传的图片
     static String IMG_SRC_REGEX = "<img\\s+[^>]*src\\s*=\\s*([\"'])(/platform/sys/file/download\\?id=.*?)\\1[^>]*>";
 
@@ -204,6 +216,219 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         return Collections.unmodifiableMap(columns);
     }
 
+    /**
+     * 按办理页面当前筛选条件和可见列导出列表，查询范围与页面分页列表保持一致。
+     *
+     * @param pageCode 页面代码
+     * @param pageForm 页面筛选条件
+     * @param approval 审核状态
+     * @param tableColumns 页面可见列
+     * @param response HTTP 响应
+     */
+    @Override
+    public void exportWorkflowList(String pageCode, ProposalSearchParam pageForm, boolean approval,
+                                   ExportTableColumns[] tableColumns, HttpServletResponse response) {
+        List<ExportTableColumns> exportColumns = getWorkflowExportColumns(pageCode, tableColumns);
+        if (exportColumns.isEmpty()) {
+            throw Lang.makeThrow("请选择至少一个列表字段后再导出");
+        }
+
+        Sql sql = buildWorkflowExportSql(pageCode, pageForm, approval);
+        List<NutMap> rows = listMap(sql);
+        convertWorkflowExportValues(rows, pageCode);
+
+        List<ExcelExportEntity> excelColumns = new ArrayList<>();
+        for (ExportTableColumns column : exportColumns) {
+            excelColumns.add(new ExcelExportEntity(column.getLabel(), column.getProp(), 20));
+        }
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF);
+        exportParams.setTitle("提案列表");
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, excelColumns, rows);
+        CommonDownloadUtil.download("提案列表.xlsx", workbook, response);
+    }
+
+    /** 根据页面代码构造导出查询，保证数据权限、筛选条件及排序规则与列表页一致。 */
+    private Sql buildWorkflowExportSql(String pageCode, ProposalSearchParam pageForm, boolean approval) {
+        boolean isUnitReply = "unitReply".equals(pageCode);
+        boolean isSchoolLeaderApproval = "schoolLeaderApproval".equals(pageCode);
+        boolean requiresUnionFilter = Set.of("preAudit", "committeeFiling", "committeeFilingUnit",
+                "schoolLeaderApproval", "caseCheck").contains(pageCode);
+        String taskName = getWorkflowTaskName(pageCode);
+
+        String schoolLeaderColumns = isSchoolLeaderApproval ? """
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName,
+                    GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames,
+                    """ : "";
+        String auditUserColumn = (isSchoolLeaderApproval || isUnitReply)
+                ? "GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')') AS auditUser,"
+                : "";
+        String unitReplyColumns = isUnitReply ? """
+                    COALESCE(NULLIF(t.variable->>'$.underTakeName', ''), replyUnit.unitName) AS underTakeName,
+                    CASE
+                        WHEN JSON_EXTRACT(t.variable, '$.underTakeIsMaster') IS NOT NULL
+                            THEN IF(JSON_EXTRACT(t.variable, '$.underTakeIsMaster') = true, 1, 0)
+                        ELSE IFNULL(replyUnit.isMaster, 0)
+                    END AS underTakeIsMaster,
+                    """ : "";
+        String unionJoin = requiresUnionFilter ? "LEFT JOIN vw_user vu ON vu.id = info.createUserId" : "";
+        String schoolLeaderJoin = isSchoolLeaderApproval ? "LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id" : "";
+        String unitReplyJoin = isUnitReply
+                ? "LEFT JOIN proposal_reply_unit replyUnit ON replyUnit.proposalId = info.id AND replyUnit.unitId = ta.actorUnitId\n                    LEFT JOIN sys_user transferUser ON transferUser.id = t.variable->>'$.tf_transferUserId'"
+                : "";
+
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.*,
+                    type.name AS typeName,
+                    IF(mer.proposalId IS NOT NULL, 1, 0) AS merge,
+                    tcs.fullName AS sessionName,
+                    tcd.`name` AS delegationName,
+                    ins.state AS instanceState,
+                    t.finishTime,
+                %s
+                %s
+                %s
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName), '结束') AS curTaskName
+                FROM wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    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 proposal_info info ON info.id = ins.businessNo
+                    LEFT JOIN proposal_type type ON type.id = info.typeId
+                    LEFT JOIN proposal_merge mer ON mer.proposalId = info.id
+                    LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
+                    LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId
+                    %s
+                    %s
+                    %s
+                $condition
+                """.formatted(schoolLeaderColumns, auditUserColumn, unitReplyColumns, unionJoin, schoolLeaderJoin, unitReplyJoin));
+
+        Cnd cnd = Cnd.NEW();
+        if (isUnitReply) {
+            cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply"));
+            if (!"superadmin".equals(SecurityUtil.getUserLoginname())) {
+                cnd.and("ta.actorId", "=", SecurityUtil.getUserId());
+            }
+        } else {
+            cnd.and("t.taskName", "=", taskName);
+            if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
+                cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+            }
+        }
+        if (approval) {
+            cnd.and("t.taskState", "in", isUnitReply
+                    ? List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.TRANSFER.getCode())
+                    : List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        if (requiresUnionFilter) {
+            cnd.andEX("vu.unionId", "=", pageForm.getUnionId());
+        }
+        ProposalSearchParam.buildSearch(cnd, pageForm);
+        cnd.groupBy("t.id");
+        if (!applySafeProposalListOrder(cnd, pageForm, pageCode)) {
+            cnd.desc("t.createdAt");
+        }
+        sql.setCondition(cnd);
+        return sql;
+    }
+
+    /** 获取页面对应的流程任务编码，页面代码不匹配时拒绝导出。 */
+    private String getWorkflowTaskName(String pageCode) {
+        Map<String, String> taskNames = Map.of(
+                "delegation", "delegation",
+                "preAudit", "preAudit",
+                "committeeFiling", "committee",
+                "committeeFilingUnit", "committeeFilingUnit",
+                "schoolLeaderApproval", "schoolLeader",
+                "feedbackEvaluation", "feedback",
+                "caseCheck", "caseCheck"
+        );
+        String taskName = taskNames.get(pageCode);
+        if (StrUtil.isBlank(taskName) && !"unitReply".equals(pageCode)) {
+            throw Lang.makeThrow("不支持的提案列表导出页面");
+        }
+        return taskName;
+    }
+
+    /** 将字典、枚举及组合字段转换为与列表页面相同的显示文本。 */
+    private void convertWorkflowExportValues(List<NutMap> rows, String pageCode) {
+        Map<String, String> caseFilingResultMap = sysDictService.getSubListByCode("PROPOSAL_CASE_FILING_RESULT")
+                .stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName));
+        Map<Integer, String> processStateMap = Arrays.stream(ProcessInstanceStateEnum.values())
+                .collect(Collectors.toMap(ProcessInstanceStateEnum::getCode, ProcessInstanceStateEnum::getMessage));
+        for (NutMap row : rows) {
+            if ("schoolLeaderApproval".equals(pageCode)) {
+                row.put("undertakeUnits", formatUndertakeUnits(row));
+            }
+            // 所有含“是否并案”列的办理页面统一导出“是/否”，避免未并案记录出现空白。
+            row.put("merge", row.getInt("merge") == 1 ? "是" : "否");
+            if ("unitReply".equals(pageCode)) {
+                row.put("underTakeIsMaster", row.getInt("underTakeIsMaster") == 1 ? "主办" : "协办");
+            }
+            row.put("caseFilingResult", caseFilingResultMap.getOrDefault(row.getString("caseFilingResult"), row.getString("caseFilingResult")));
+            Integer instanceState = row.getInt("instanceState");
+            row.put("instanceState", processStateMap.getOrDefault(instanceState, row.getString("instanceState")));
+        }
+    }
+
+    /** 校领导审批页按页面展示规则拼接承办单位。 */
+    private String formatUndertakeUnits(NutMap row) {
+        String masterUnitNames = StrUtil.nullToEmpty(row.getString("masterUnitName"));
+        String slaveUnitNames = StrUtil.nullToEmpty(row.getString("slaveUnitNames"));
+        if ("SUGGESTION".equals(row.getString("caseFilingResult"))) {
+            return StrUtil.isNotBlank(masterUnitNames) ? masterUnitNames : slaveUnitNames;
+        }
+        if ("CONFIRM_FILING".equals(row.getString("caseFilingResult"))) {
+            List<String> unitNames = new ArrayList<>();
+            if (StrUtil.isNotBlank(masterUnitNames)) {
+                unitNames.add("主办：" + masterUnitNames);
+            }
+            if (StrUtil.isNotBlank(slaveUnitNames)) {
+                unitNames.add("协办：" + slaveUnitNames);
+            }
+            return StrUtil.join("；", unitNames);
+        }
+        return "";
+    }
+
+    /** 根据页面列定义过滤导出字段，确保导出范围只包含列表可展示字段。 */
+    private List<ExportTableColumns> getWorkflowExportColumns(String pageCode, ExportTableColumns[] tableColumns) {
+        Set<String> allowedColumns = WORKFLOW_EXPORT_COLUMNS.get(pageCode);
+        if (allowedColumns == null || tableColumns == null) {
+            return List.of();
+        }
+        return Arrays.stream(tableColumns)
+                .filter(Objects::nonNull)
+                .filter(column -> StrUtil.isNotBlank(column.getLabel()) && allowedColumns.contains(column.getProp()))
+                .collect(Collectors.toList());
+    }
+
+    /** 初始化各办理页面可导出的列表字段白名单。 */
+    private static Map<String, Set<String>> createWorkflowExportColumns() {
+        Set<String> commonColumns = Set.of("code", "caseFilingCode", "name", "createUserName", "typeName",
+                "sessionName", "delegationName", "curTaskName", "instanceState");
+        Map<String, Set<String>> columns = new HashMap<>();
+        columns.put("delegation", commonColumns);
+        columns.put("preAudit", commonColumns);
+        columns.put("caseCheck", Set.of("code", "caseFilingCode", "name", "createUserName", "typeName",
+                "sessionName", "delegationName", "curTaskName", "instanceState", "finishTime"));
+        columns.put("committeeFiling", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName",
+                "caseFilingResult", "delegationName", "curTaskName", "instanceState"));
+        columns.put("committeeFilingUnit", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName",
+                "caseFilingResult", "delegationName", "curTaskName", "instanceState"));
+        columns.put("schoolLeaderApproval", Set.of("code", "caseFilingCode", "name", "typeName", "undertakeUnits",
+                "merge", "curTaskName", "auditUser", "instanceState"));
+        columns.put("unitReply", Set.of("code", "caseFilingCode", "name", "typeName", "caseFilingResult",
+                "merge", "underTakeName", "underTakeIsMaster", "curTaskName", "auditUser", "instanceState"));
+        columns.put("feedbackEvaluation", Set.of("code", "caseFilingCode", "name", "typeName", "merge",
+                "curTaskName", "instanceState"));
+        return Collections.unmodifiableMap(columns);
+    }
+
     /**
      * 按白名单字段对统计结果执行后端排序，数字按数值比较，文本按中文区域规则比较。
      *
@@ -407,8 +632,11 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         }
 
         // 按任务节点分组
-        Map<String, List<ProcessTaskVO>> taskGroups = doneTaskVos.stream().collect(Collectors.groupingBy(ProcessTaskVO::getDisplayName));
+        Map<String, List<ProcessTaskVO>> taskGroups = doneTaskVos.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.groupingBy(ProcessTaskVO::getDisplayName));
         docData.putAll(taskGroups);
+        putProposalExportTaskAliases(id, taskGroups, docData);
 
         // 提案附议
         List<NutMap> secondInfos = new ArrayList<>();
@@ -479,22 +707,79 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         Configure config = Configure.builder()
                 .bind("secondedList", policy)
                 .bind("seconders", policy)
+                .bind("提案附议", policy)
+                .bind("提案委委员审议", policy)
                 .bind("brief", htmlRenderPolicy)
                 .bind("measures", htmlRenderPolicy)
                 .bind("taskFormData.tf_opinion", htmlRenderPolicy)
                 .build();
 
-        Map<String, Object> renderDocCellDataMap = MapUtil.of("proposal", docCellDataMap);
-        renderDocCellDataMap.put("secondedList", secondInfos);
-        renderDocCellDataMap.put("delegationAuditList", delegationAuditList);
+        // 数据库模板使用平铺占位符（例如 {{code}}、{{sessionName}}），不能将基础字段嵌套到 proposal 节点。
+        // 流程节点分组已写入 docData，附议人与代表团审核列表也必须写入同一上下文，才能被模板的循环标签识别。
+        docData.put("secondedList", secondInfos);
+        docData.put("delegationAuditList", delegationAuditList);
 
         try {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("proposal"), config).render(renderDocCellDataMap).writeAndClose(byteArrayOutputStream);
+            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("proposal"), config).render(docData).writeAndClose(byteArrayOutputStream);
         } catch (IOException e) {
             log.error("提案导出失败{}，提案id:{}", e.getMessage(), id);
         }
     }
 
+    /**
+     * 将现行工作流节点映射到历史提案表模板使用的区块名称，并按主协办单位拆分办理答复。
+     * 模板仍使用旧节点名称时，避免已完成的意见和答复因键名不一致而无法渲染。
+     *
+     * @param proposalId 提案ID，用于查询主办单位
+     * @param taskGroups 已完成任务按显示名称分组后的数据
+     * @param docData Word 模板的平铺渲染数据
+     */
+    private void putProposalExportTaskAliases(String proposalId, Map<String, List<ProcessTaskVO>> taskGroups,
+                                              NutMap docData) {
+        putTaskAlias(docData, "提案委主任审核", taskGroups.get("校工会预审核"));
+        putTaskAlias(docData, "提案委主任意见", taskGroups.get("提案委员会立案"));
+        putTaskAlias(docData, "提案委委员审议", taskGroups.get("委员会确认承办单位"));
+
+        List<ProcessTaskVO> replyTasks = taskGroups.get("承办单位答复");
+        if (Lang.isEmpty(replyTasks)) {
+            return;
+        }
+        Sql masterUnitSql = Sqls.create("SELECT unitName FROM proposal_reply_unit WHERE proposalId = @proposalId AND isMaster = 1")
+                .setParam("proposalId", proposalId);
+        List<NutMap> masterUnitRows = listMap(masterUnitSql);
+        Set<String> masterUnitNames = masterUnitRows.stream()
+                .map(row -> row.getString("unitName"))
+                .filter(StrUtil::isNotBlank)
+                .collect(Collectors.toSet());
+
+        List<ProcessTaskVO> masterReplyTasks = new ArrayList<>();
+        List<ProcessTaskVO> slaveReplyTasks = new ArrayList<>();
+        for (ProcessTaskVO replyTask : replyTasks) {
+            Dict taskFormData = replyTask.getTaskFormData();
+            String unitName = taskFormData == null ? null : taskFormData.getStr("unitName");
+            if (masterUnitNames.contains(unitName)) {
+                masterReplyTasks.add(replyTask);
+            } else {
+                slaveReplyTasks.add(replyTask);
+            }
+        }
+        putTaskAlias(docData, "主办单位答复", masterReplyTasks);
+        putTaskAlias(docData, "协办单位答复", slaveReplyTasks);
+    }
+
+    /**
+     * 仅在存在已完成任务时写入模板区块，空任务不触发 Word 条件标签。
+     *
+     * @param docData Word 模板的平铺渲染数据
+     * @param templateKey Word 模板中的条件或循环标签名称
+     * @param tasks 对应的已完成流程任务
+     */
+    private void putTaskAlias(NutMap docData, String templateKey, List<ProcessTaskVO> tasks) {
+        if (Lang.isNotEmpty(tasks)) {
+            docData.put(templateKey, tasks);
+        }
+    }
+
     @Override
     public void exportProposalFeedBackAsDocx(String id, ByteArrayOutputStream byteArrayOutputStream) {
         if (id == null || id.isEmpty()) {

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/controller/TeacherCongressInstitutionController.java

@@ -25,7 +25,6 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Strings;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 
@@ -69,32 +68,25 @@ public class TeacherCongressInstitutionController {
         Teacher_congress_institution rootInstitution = new Teacher_congress_institution();
         rootInstitution.setId("0");
         rootInstitution.setParentId("");
-        rootInstitution.setName("两代会组织机构");
+        rootInstitution.setName("教代会机构");
         rootInstitution.setLocation(0);
         institutionList.add(rootInstitution);
 
-        List<TreeNode<String>> treeNodes = institutionList.stream().map(institution -> {
-            TreeNode<String> treeNode = new TreeNode<>(institution.getId(), institution.getParentId(), institution.getName(), institution.getLocation());
-            treeNode.setExtra(Map.of("code", Strings.sNull(institution.getCode())));
-            return treeNode;
-        }).toList();
+        List<TreeNode<String>> treeNodes = institutionList.stream().map(institution -> new TreeNode<>(institution.getId(), institution.getParentId(), institution.getName(), institution.getLocation())).toList();
         List<Tree<String>> treeList = TreeUtil.build(treeNodes, "");
         return Result.success(treeList);
     }
 
     /**
-     * 获取新增机构表单使用的固定机构字典树。
+     * 表单中的树结构
      *
-     * @param sessionId 当前教代会届次ID，用于保持接口参数与机构管理页面上下文一致
-     * @return Result，data.treeList 为级联组件树结构，data.treeFlat 为名称和代码回填使用的扁平字典列表
+     * @param sessionId
+     * @return
      */
     @At
     @SaCheckPermission("tc.institution")
     public Result formTree(@Valid String sessionId) {
         Sys_dict institutionFixedDict = sysDictService.fetch(Cnd.where(Sys_dict::getCode, "=", "TEACHER_CONGRESS_INSTITUTION_FIXED"));
-        if (ObjectUtil.isEmpty(institutionFixedDict)) {
-            return Result.error("未配置双代会固定机构字典");
-        }
         List<Sys_dict> children = sysDictService.query(Cnd.where(Sys_dict::getPath, "like", institutionFixedDict.getPath() + "%"));
         List<TreeNode<String>> treeNodes = children.stream().map(sysDict -> {
             TreeNode<String> treeNode = new TreeNode<>(sysDict.getId(), sysDict.getParentId(), sysDict.getName(), sysDict.getLocation());
@@ -105,16 +97,6 @@ public class TeacherCongressInstitutionController {
         return Result.success(Map.of("treeFlat", children, "treeList", treeList));
     }
 
-    @At
-    @SaCheckPermission("tc.institution")
-    public Result specialCommitteeRoleOptions() {
-        Sys_dict parent = sysDictService.fetch(Cnd.where(Sys_dict::getCode, "=", "SPECIAL_COMMITTEE_ROLES"));
-        if (ObjectUtil.isEmpty(parent)) {
-            return Result.success(List.of());
-        }
-        List<Sys_dict> children = sysDictService.query(Cnd.where(Sys_dict::getPath, "like", parent.getPath() + "%").and(Sys_dict::getId, "!=", parent.getId()).asc(Sys_dict::getLocation));
-        return Result.success(children);
-    }
 
     /**
      * 机构分页查询
@@ -131,30 +113,24 @@ public class TeacherCongressInstitutionController {
         cnd.and("parentId", "=", parentId);
         cnd.and("sessionId", "=", sessionId);
         cnd.asc("location");
-        cnd.asc("code");
         Pagination pagination = baseService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), "teacher_congress_institution", cnd);
         return Result.success(pagination);
     }
 
     /**
-     * 添加当前届次的机构。
+     * 添加机构
      *
-     * @param institution 机构数据，包含 sessionId、name、code、parentId、location 和 introduce；parentId 可能是固定字典ID
-     * @return Result，机构重复或父级不存在时返回错误，否则返回成功
+     * @param institution
+     * @return
      */
     @At
     @SaCheckPermission("tc.institution")
-    @Aop(TransAop.READ_COMMITTED)
     public Result insert(Teacher_congress_institution institution) {
         if (dao.count(Teacher_congress_institution.class, Cnd.where(Teacher_congress_institution::getCode, "=", institution.getCode()).and(Teacher_congress_institution::getSessionId, "=", institution.getSessionId())) > 0) {
             return Result.error("机构已存在");
         }
-        if (StrUtil.isNotBlank(institution.getParentId()) && !institution.getParentId().equals("0") && dao.count(Teacher_congress_institution.class, Cnd.where(Teacher_congress_institution::getId, "=", institution.getParentId()).and(Teacher_congress_institution::getSessionId, "=", institution.getSessionId())) == 0) {
-            // 级联框提交的是固定字典父级ID，需要按机构代码匹配当前届次的实际父机构。
+        if (StrUtil.isNotBlank(institution.getParentId()) && !institution.getParentId().equals("0")) {
             Sys_dict sysDict = sysDictService.fetch(Cnd.where(Sys_dict::getId, "=", institution.getParentId()));
-            if (ObjectUtil.isEmpty(sysDict)) {
-                return Result.error("父级机构不存在");
-            }
             Teacher_congress_institution parentInstitution = dao.fetch(Teacher_congress_institution.class,
                     Cnd.where(Teacher_congress_institution::getCode, "=", sysDict.getCode())
                             .and(Teacher_congress_institution::getSessionId, "=", institution.getSessionId())
@@ -170,40 +146,15 @@ public class TeacherCongressInstitutionController {
     }
 
     /**
-     * 更新机构名称、描述和排序。
+     * 删除机构
      *
-     * @param institution 机构数据，id 标识待更新机构，name、introduce、location 为可更新内容
-     * @return Result，机构不存在时返回错误，否则返回成功
+     * @param id
+     * @return
      */
-    @At
-    @SaCheckPermission("tc.institution")
-    @Aop(TransAop.READ_COMMITTED)
-    public Result update(Teacher_congress_institution institution) {
-        Teacher_congress_institution dbInstitution = dao.fetch(Teacher_congress_institution.class, institution.getId());
-        if (ObjectUtil.isEmpty(dbInstitution)) {
-            return Result.error("机构不存在");
-        }
-        dbInstitution.setName(institution.getName());
-        dbInstitution.setIntroduce(institution.getIntroduce());
-        dbInstitution.setLocation(institution.getLocation());
-        dao.update(dbInstitution);
-        return Result.success();
-    }
-
     @At
     @SaCheckPermission("tc.institution")
     @Aop(TransAop.READ_COMMITTED)
     public Result delete(@Valid String id) {
-        Teacher_congress_institution institution = dao.fetch(Teacher_congress_institution.class, id);
-        if (ObjectUtil.isEmpty(institution)) {
-            return Result.error("机构不存在");
-        }
-        List<Teacher_congress_institution> siblingList = dao.query(Teacher_congress_institution.class, Cnd.where(Teacher_congress_institution::getParentId, "=", institution.getParentId()).and(Teacher_congress_institution::getSessionId, "=", institution.getSessionId()).asc(Teacher_congress_institution::getLocation).asc(Teacher_congress_institution::getCode));
-        for (int i = 0; i < siblingList.size() && i < 6; i++) {
-            if (id.equals(siblingList.get(i).getId())) {
-                return Result.error("你选择的组织机构是两代会基本机构，不允许删除。");
-            }
-        }
         dao.delete(Teacher_congress_institution.class, id);
         dao.clear(Teacher_congress_institution_user.class, Cnd.where("institutionId", "=", id));
         return Result.success();
@@ -263,8 +214,8 @@ public class TeacherCongressInstitutionController {
     @SaCheckPermission("tc.institution")
     @SLog(tag = "教代会-机构设置", msg = "添加人员")
     @Aop(TransAop.READ_COMMITTED)
-    public Result userInsert(@Valid String userId, @Valid String institutionId, @Valid String sessionId, @Valid String identity, String roleCode) {
-        teacherCongressInstitutionUserService.userInsert(userId, institutionId, sessionId, identity, roleCode);
+    public Result userInsert(@Valid String userId, @Valid String institutionId, @Valid String sessionId, @Valid String identity) {
+        teacherCongressInstitutionUserService.userInsert(userId, institutionId, sessionId, identity);
         return Result.success();
     }
 
@@ -276,7 +227,6 @@ public class TeacherCongressInstitutionController {
      */
     @At
     @SaCheckPermission("tc.institution")
-    @Aop(TransAop.READ_COMMITTED)
     public Result userDelete(@Valid String id) {
         teacherCongressInstitutionUserService.userDelete(id);
         return Result.success();

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/service/TeacherCongressInstitutionUserService.java

@@ -14,7 +14,7 @@ public interface TeacherCongressInstitutionUserService extends BaseService<Teach
      * @param sessionId     届次id
      * @param identity      身份 主任|副主任|成员
      */
-    void userInsert(String userId, String institutionId, String sessionId, String identity, String roleCode);
+    void userInsert(String userId, String institutionId, String sessionId, String identity);
 
     /**
      * 删除机构成员

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/service/impl/TeacherCongressInstitutionUserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.budwk.app.zhgh.democratic.teachercongress.institution.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
@@ -31,7 +30,7 @@ public class TeacherCongressInstitutionUserServiceImpl extends BaseServiceImpl<T
 
     @Override
     @Aop(TransAop.READ_COMMITTED)
-    public void userInsert(String userId, String institutionId, String sessionId, String identity, String roleCode) {
+    public void userInsert(String userId, String institutionId, String sessionId, String identity) {
         int count = dao().count(Teacher_congress_institution_user.class,
                 Cnd.where(Teacher_congress_institution_user::getInstitutionId, "=", institutionId)
                         .and(Teacher_congress_institution_user::getUserId, "=", userId)
@@ -50,28 +49,6 @@ public class TeacherCongressInstitutionUserServiceImpl extends BaseServiceImpl<T
         dao().insert(institutionUser);
 
         Teacher_congress_institution institution = dao().fetch(Teacher_congress_institution.class, institutionId);
-        if ("ZWH001".equals(institution.getCode()) || "ZXWYH".equals(institution.getCode()) || "DBZGSCXZ".equals(institution.getCode())) {
-            if (StrUtil.isBlank(roleCode)) {
-                throw new BaseException("请选择角色");
-            }
-            Sys_role sysRole = sysRoleService.fetch(Cnd.where(Sys_role::getCode, "=", roleCode));
-            if (sysRole == null) {
-                throw new BaseException("无法找到" + roleCode + "对应编码的角色");
-            }
-            int existsRole = dao().count(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", userId)
-                    .and(Sys_user_role::getTcSessionId, "=", sessionId)
-                    .and(Sys_user_role::getRoleId, "=", sysRole.getId())
-            );
-            if (existsRole == 0) {
-                Sys_user_role insertSysUserRole = new Sys_user_role();
-                insertSysUserRole.setRoleId(sysRole.getId());
-                insertSysUserRole.setUserId(userId);
-                insertSysUserRole.setTcSessionId(sessionId);
-                dao().insert(insertSysUserRole);
-                sysRoleService.clearCache();
-                sysUserService.clearCache();
-            }
-        }
         if (institution.getCode().contains("TEACHER_CONGRESS_INSTITUTION_PROPOSAL_COMMITTEE") && identity.equals("主任")) {
             Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_COMMITTEE_DIRECTOR);
             int existsRole = dao().count(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", userId)