fix: 修复文化活动表单交互并统一流程图布局

- 修复活动列表插槽渲染异常及字段回显问题
- 修复选择联系人时的报错和手机号回填逻辑
- 暂时注释报名表单及设计入口
- 统一社团、分工会文化活动新建和编辑页的流程图布局
- 隐藏社团文化活动进入审核后的编辑入口

.gitignore

@@ -2,6 +2,8 @@
 **/node_modules/
 **/dist/
 **/build/
+!src/main/resources/static/assets/platform/plugins/pdfJs/build/
+!src/main/resources/static/assets/platform/plugins/pdfJs/build/**
 **/target/
 **/out/
 **/.next/

src/main/java/com/budwk/app/base/constant/RoleConstant.java

@@ -19,6 +19,8 @@ RoleConstant {
     SCHOOL_UNION_ADMIN("校工会管理员"),
     SCHOOL_UNION_CHAIRMAN("校工会主席"),
     SCHOOL_UNION_VICE_CHAIRMAN("校工会副主席"),
+    SCHOOL_UNION_FINANCE("校工会财务"),
+    SCHOOL_OFFICE_DIRECTOR("校工会办公室主任"),
     SCHOOL_UNION_WELFARE_ADMIN("校工会福利管理员"),
     SCHOOL_UNION_MEMBER_ADMIN("校工会会员管理员"),
     SCHOOL_UNION_TC_ADMIN("校工会教代会管理员"),
@@ -50,6 +52,7 @@ RoleConstant {
     BRANCH_UNION_WENTI_SPORTS("分工会文体福利委员"),
 
 	UNIT_PARTY_SECRETARY("单位党委书记"),
+	UNIT_SCHOOL_LEADER("单位分管校领导"),
 
     TEACHER_CONGRESS_DELEGATE_FORMAL("教代会正式代表"),
     TEACHER_CONGRESS_DELEGATE_ATTENDANCE("教代会列席代表"),

src/main/java/com/budwk/app/base/utils/OfficePlusUtil.java

@@ -1,10 +1,16 @@
 package com.budwk.app.base.utils;
 
 import cn.hutool.core.io.FileUtil;
+import com.aspose.cells.FontConfigs;
 import com.aspose.cells.PdfSaveOptions;
 import com.aspose.cells.Workbook;
+import com.aspose.slides.FontsLoader;
+import com.aspose.slides.LoadOptions;
 import com.aspose.slides.Presentation;
 import com.aspose.words.Document;
+import com.aspose.words.FontSettings;
+import com.aspose.words.FontSourceBase;
+import com.aspose.words.MemoryFontSource;
 import com.aspose.words.SaveFormat;
 import com.budwk.app.base.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +18,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
 
 /**
  * 文档转换
@@ -19,6 +27,81 @@ import java.io.IOException;
 @Slf4j
 public class OfficePlusUtil {
 
+    private static final String DEFAULT_FONT_NAME = "Noto Sans SC";
+    private static final String DEFAULT_FONT_RESOURCE = "/fonts/NotoSansSC-VF.ttf";
+    private static final Object FONT_CONFIG_LOCK = new Object();
+    private static volatile boolean fontConfigured;
+
+    /**
+     * 注册系统内置字体，并将其作为 Office 文档缺失字体或缺失字形时的默认回退字体。
+     * 原文档字体在服务器可用时仍优先使用，只有找不到原字体时才使用内置字体。
+     */
+    private static void configureDefaultFont() {
+        if (fontConfigured) {
+            return;
+        }
+        synchronized (FONT_CONFIG_LOCK) {
+            if (fontConfigured) {
+                return;
+            }
+            byte[] fontData = loadDefaultFontData();
+            configureWordFont(fontData);
+            configureExcelFont(fontData);
+            FontsLoader.loadExternalFont(fontData);
+            fontConfigured = true;
+        }
+    }
+
+    /**
+     * 从 classpath 读取随应用打包的字体，避免依赖线上服务器安装字体。
+     *
+     * @return 默认字体的二进制数据
+     */
+    private static byte[] loadDefaultFontData() {
+        try (InputStream inputStream = OfficePlusUtil.class.getResourceAsStream(DEFAULT_FONT_RESOURCE)) {
+            if (inputStream == null) {
+                throw new BaseException("系统内置默认字体不存在");
+            }
+            return inputStream.readAllBytes();
+        } catch (IOException e) {
+            log.error("读取系统内置默认字体失败", e);
+            throw new BaseException("读取系统内置默认字体失败");
+        }
+    }
+
+    /**
+     * 为 Word 转换保留已有字体源并追加内置字体，同时配置缺失字体和缺失字形回退。
+     *
+     * @param fontData 默认字体的二进制数据
+     */
+    private static void configureWordFont(byte[] fontData) {
+        FontSettings fontSettings = FontSettings.getDefaultInstance();
+        FontSourceBase[] currentSources = fontSettings.getFontsSources();
+        FontSourceBase[] fontSources = Arrays.copyOf(currentSources, currentSources.length + 1);
+        fontSources[currentSources.length] = new MemoryFontSource(fontData);
+        fontSettings.setFontsSources(fontSources);
+        fontSettings.getSubstitutionSettings().getDefaultFontSubstitution().setDefaultFontName(DEFAULT_FONT_NAME);
+        try {
+            fontSettings.getFallbackSettings().loadNotoFallbackSettings();
+        } catch (Exception e) {
+            log.error("配置 Word 默认字体回退规则失败", e);
+            throw new BaseException("配置 Word 默认字体失败");
+        }
+    }
+
+    /**
+     * 为 Excel 转换追加内置字体，并将其设置为找不到原字体时的默认字体。
+     *
+     * @param fontData 默认字体的二进制数据
+     */
+    private static void configureExcelFont(byte[] fontData) {
+        com.aspose.cells.FontSourceBase[] currentSources = FontConfigs.getFontSources();
+        com.aspose.cells.FontSourceBase[] fontSources = Arrays.copyOf(currentSources, currentSources.length + 1);
+        fontSources[currentSources.length] = new com.aspose.cells.MemoryFontSource(fontData);
+        FontConfigs.setFontSources(fontSources);
+        FontConfigs.setDefaultFontName(DEFAULT_FONT_NAME);
+    }
+
     /**
      * 转换
      *
@@ -47,7 +130,11 @@ public class OfficePlusUtil {
     public static void presentationConvertPdf(String sourcePath, String targetPath) {
         Presentation presentation = null;
         try {
-            presentation = new Presentation(sourcePath);
+            configureDefaultFont();
+            LoadOptions loadOptions = new LoadOptions();
+            loadOptions.setDefaultRegularFont(DEFAULT_FONT_NAME);
+            loadOptions.setDefaultAsianFont(DEFAULT_FONT_NAME);
+            presentation = new Presentation(sourcePath, loadOptions);
             presentation.save(targetPath, com.aspose.slides.SaveFormat.Pdf);
         } catch (Exception e) {
             log.info("转换pdf报错", e);
@@ -68,10 +155,12 @@ public class OfficePlusUtil {
     public static void excelConvertPdf(String sourcePath, String targetPath) {
         FileOutputStream fileOS = null;
         try {
+            configureDefaultFont();
             Workbook wb = new Workbook(sourcePath);
             fileOS = new FileOutputStream(targetPath);
             PdfSaveOptions pdfSaveOptions = new PdfSaveOptions();
             pdfSaveOptions.setOnePagePerSheet(true);
+            pdfSaveOptions.setDefaultFont(DEFAULT_FONT_NAME);
 //            for (int i = 0; i < 3; i++) {
 //                wb.getWorksheets().get(i).getHorizontalPageBreaks().clear();
 //                wb.getWorksheets().get(i).getVerticalPageBreaks().clear();
@@ -105,6 +194,7 @@ public class OfficePlusUtil {
     public static void wordConvertPdf(String sourcePath, String targetPath) {
         FileOutputStream os = null;
         try {
+            configureDefaultFont();
             File file = new File(targetPath);
             os = new FileOutputStream(file);
             Document doc = new Document(sourcePath);

src/main/java/com/budwk/app/base/utils/SysOfficeTemplateUtil.java

@@ -5,7 +5,10 @@ import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.sys.models.Sys_file;
 import com.budwk.app.sys.models.Sys_office_template;
+import com.budwk.app.sys.services.SysFileService;
 import com.budwk.app.sys.utils.SysFileMinIoUtil;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.data.ByteArrayPictureRenderData;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.data.PictureType;
@@ -18,6 +21,13 @@ import org.nutz.ioc.loader.annotation.IocBean;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,6 +41,23 @@ public class SysOfficeTemplateUtil {
     @Inject
     private Dao dao;
 
+    @Inject
+    private SysFileService sysFileService;
+
+    public String getTemplateFileName(String templateCode) {
+        Sys_office_template officeTemplate = dao.fetch(Sys_office_template.class, Cnd.where(Sys_office_template::getTemplateCode, "=", templateCode));
+        if (ObjectUtil.isNull(officeTemplate)) {
+            throw new BaseException("代码为：{}的模板不存在", templateCode);
+        }
+        String templatePath = officeTemplate.getTemplatePath();
+        String id = templatePath.substring(templatePath.indexOf("id=") + "id=".length());
+        Sys_file sysFile = dao.fetch(Sys_file.class, id);
+        if (ObjectUtil.isEmpty(sysFile)) {
+            throw new BaseException("模板文件不存在");
+        }
+        return sysFile.getName();
+    }
+
     /**
      * 获取模板文件输入流
      *
@@ -48,10 +75,101 @@ public class SysOfficeTemplateUtil {
         if (ObjectUtil.isEmpty(sysFile)) {
             throw new BaseException("模板文件不存在");
         }
-        byte[] fileBytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+        byte[] fileBytes;
+        try {
+            fileBytes = sysFileService.download(id);
+        } catch (IOException e) {
+            log.error("模板文件读取失败，templateCode={}，fileId={}", templateCode, id, e);
+            throw new BaseException("模板 {} 的文件读取失败：{}", templateCode, e.getMessage());
+        }
+        if (fileBytes == null || fileBytes.length == 0) {
+            throw new BaseException("模板 {} 的文件为空或读取失败，文件名：{}", templateCode, sysFile.getName());
+        }
         return new ByteArrayInputStream(fileBytes);
     }
 
+    /**
+     * 统一渲染 DOC/DOCX 模板，保留调用方的循环表格等策略；模板输入流由调用方关闭。
+     */
+    public byte[] renderTemplate(InputStream input, Object data, Configure config, boolean pdf, String context) throws Exception {
+        if (input == null) throw new BaseException("模板文件不存在");
+        byte[] templateBytes = input.readAllBytes();
+        try (ByteArrayInputStream formatInput = new ByteArrayInputStream(templateBytes)) {
+            if (com.aspose.words.FileFormatUtil.detectFileFormat(formatInput).getLoadFormat() != com.aspose.words.LoadFormat.DOCX) {
+                try (ByteArrayInputStream source = new ByteArrayInputStream(templateBytes);
+                     ByteArrayOutputStream converted = new ByteArrayOutputStream()) {
+                    new com.aspose.words.Document(source).save(converted, com.aspose.words.SaveFormat.DOCX);
+                    templateBytes = converted.toByteArray();
+                }
+            }
+        }
+        byte[] wordBytes;
+        try (ByteArrayInputStream templateInput = new ByteArrayInputStream(templateBytes);
+             ByteArrayOutputStream output = new ByteArrayOutputStream();
+             XWPFTemplate template = XWPFTemplate.compile(templateInput, config == null ? Configure.builder().build() : config)) {
+            template.render(data).write(output);
+            wordBytes = output.toByteArray();
+        } catch (Exception e) {
+            log.error("[Office模板渲染] Word模板渲染失败，context={}", context, e);
+            throw e;
+        }
+        log.info("[Office模板渲染] Word渲染完成，context={}, templateBytes={}, outputBytes={}", context, templateBytes.length, wordBytes.length);
+        if (!pdf) return wordBytes;
+        try (ByteArrayInputStream wordInput = new ByteArrayInputStream(wordBytes);
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            com.aspose.words.Document document = new com.aspose.words.Document(wordInput);
+            configureDocumentFonts(document, context);
+            com.aspose.words.PdfSaveOptions options = new com.aspose.words.PdfSaveOptions();
+            options.setFontEmbeddingMode(com.aspose.words.PdfFontEmbeddingMode.EMBED_ALL);
+            document.save(output, options);
+            log.info("[Office模板渲染] PDF转换完成，context={}, outputBytes={}", context, output.size());
+            return output.toByteArray();
+        } catch (Exception e) {
+            log.error("[Office模板渲染] PDF转换失败，context={}", context, e);
+            throw e;
+        }
+    }
+
+    private void configureDocumentFonts(com.aspose.words.Document document, String context) throws Exception {
+        com.aspose.words.FontSettings settings = new com.aspose.words.FontSettings();
+        List<com.aspose.words.FontSourceBase> sources = new ArrayList<>(List.of(settings.getFontsSources()));
+        Set<String> folders = new LinkedHashSet<>();
+        String windowsDir = System.getenv("WINDIR");
+        if (StrUtil.isNotBlank(windowsDir)) folders.add(new File(windowsDir, "Fonts").getPath());
+        String localAppData = System.getenv("LOCALAPPDATA");
+        if (StrUtil.isNotBlank(localAppData)) folders.add(new File(localAppData, "Microsoft/Windows/Fonts").getPath());
+        folders.add(new File(System.getProperty("user.dir"), "fonts").getPath());
+        for (String folder : folders) {
+            File directory = new File(folder);
+            log.info("[Office模板渲染] 字体目录，context={}, path={}, readable={}", context, folder, directory.isDirectory() && directory.canRead());
+            if (directory.isDirectory() && directory.canRead()) sources.add(new com.aspose.words.FolderFontSource(folder, true));
+        }
+        settings.setFontsSources(sources.toArray(new com.aspose.words.FontSourceBase[0]));
+        Set<String> availableFonts = new LinkedHashSet<>();
+        for (com.aspose.words.FontSourceBase source : sources) {
+            for (com.aspose.words.PhysicalFontInfo font : source.getAvailableFonts()) availableFonts.add(font.getFontFamilyName());
+        }
+        String chineseFont = null;
+        for (String candidate : List.of("SimSun", "宋体", "Microsoft YaHei", "微软雅黑", "DengXian", "等线", "SimHei", "黑体", "FangSong", "仿宋", "Noto Serif CJK SC", "Noto Sans CJK SC")) {
+            if (availableFonts.contains(candidate)) {
+                chineseFont = candidate;
+                break;
+            }
+        }
+        log.info("[Office模板渲染] 中文字体选择，context={}, fontCount={}, chineseFont={}", context, availableFonts.size(), chineseFont);
+        if (chineseFont != null) {
+            settings.getSubstitutionSettings().getDefaultFontSubstitution().setDefaultFontName(chineseFont);
+            for (String name : List.of("宋体", "SimSun", "新宋体", "NSimSun", "黑体", "SimHei", "仿宋", "FangSong", "楷体", "KaiTi", "微软雅黑", "Microsoft YaHei")) {
+                if (!availableFonts.contains(name)) settings.getSubstitutionSettings().getTableSubstitution().setSubstitutes(name, chineseFont);
+            }
+        } else {
+            log.warn("[Office模板渲染] 未发现常用中文字体，context={}, availableFonts={}", context, availableFonts);
+        }
+        settings.getFallbackSettings().loadMsOfficeFallbackSettings();
+        document.setFontSettings(settings);
+        document.setWarningCallback(warning -> log.warn("[Office模板渲染] 字体或排版警告，context={}, type={}, detail={}", context, warning.getWarningType(), warning.getDescription()));
+    }
+
     /**
      * 签字url转换为poi的图片对象
      *
@@ -63,13 +181,7 @@ public class SysOfficeTemplateUtil {
     public PictureRenderData createPictureRenderData(int width, int height, String url) {
         try {
             byte[] bytes = getFileBytesByUrl(url);
-//            if (StrUtil.isBlank(url)) {
-//                return null;
-//            }
-//            int startIndex = url.indexOf("id=") + "id=".length();
-//            String id = url.substring(startIndex);
-//            Sys_file sysFile = dao.fetch(Sys_file.class, id);
-//            byte[] bytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 创建图片渲染数据，referenceLength={}, byteCount={}, width={}, height={}", StrUtil.nullToEmpty(url).length(), bytes == null ? null : bytes.length, width, height);
             ByteArrayPictureRenderData pictureRenderData = new ByteArrayPictureRenderData(bytes, PictureType.PNG);
             PictureStyle pictureStyle = new PictureStyle();
             pictureStyle.setWidth(width);
@@ -77,7 +189,7 @@ public class SysOfficeTemplateUtil {
             pictureRenderData.setPictureStyle(pictureStyle);
             return pictureRenderData;
         } catch (Exception e) {
-            log.error("文件转换PictureRenderData错误，文件路径：{},{}", url, e.getMessage());
+            log.error("[Office图片读取] 创建图片渲染数据失败，referenceLength={}", StrUtil.nullToEmpty(url).length(), e);
             return null;
         }
     }
@@ -126,13 +238,20 @@ public class SysOfficeTemplateUtil {
     public byte[] getFileBytesByUrl(String url) {
         try {
             if (StrUtil.isBlank(url)) {
+                log.warn("[Office图片读取] 图片引用为空");
                 return null;
             }
             int startIndex = url.indexOf("id=") + "id=".length();
             String id = url.substring(startIndex);
+            String logFileId = url.contains("id=") ? id : "未识别id参数";
+            log.info("[Office图片读取] 解析文件引用，fileId={}, hasIdParameter={}", logFileId, url.contains("id="));
             Sys_file sysFile = dao.fetch(Sys_file.class, id);
-            return SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 查询文件记录，fileId={}, found={}, bucket={}, storagePathPresent={}", logFileId, sysFile != null, sysFile == null ? null : sysFile.getBucket(), sysFile != null && StrUtil.isNotBlank(sysFile.getStoragePath()));
+            byte[] bytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 读取存储文件完成，fileId={}, byteCount={}", logFileId, bytes == null ? null : bytes.length);
+            return bytes;
         } catch (Exception e) {
+            log.error("[Office图片读取] 读取图片失败，referenceLength={}", StrUtil.nullToEmpty(url).length(), e);
             return null;
         }
     }

src/main/java/com/budwk/app/base/wxwork/WxWorkMessageService.java

@@ -0,0 +1,29 @@
+package com.budwk.app.base.wxwork;
+
+import org.nutz.lang.util.NutMap;
+import java.util.List;
+
+/** 企业微信自建应用消息服务，接收人的 loginname 必须对应学校企业微信 userid。 */
+public interface WxWorkMessageService {
+    /**
+     * 单人发送；link 为空发送文本，否则发送文本卡片，相对链接使用配置域名补全。
+     * @param loginname 接收人的企业微信 userid，当前学校直接使用系统 loginname
+     * @param title 消息标题，为空使用配置的默认标题
+     * @param content 消息正文，可含富文本标签，发送前转为纯文本
+     * @param link 业务详情链接，可为空、站内相对路径或完整 HTTP(S) 地址
+     * @return 与 massSend 相同的结果结构；skipped 表示关闭开关而未发送
+     */
+    NutMap send(String loginname, String title, String content, String link);
+
+    /**
+     * 多人发送相同消息，去重并分批调用企业微信接口。
+     * @param loginNames 接收人 loginname 列表，每项须为企业微信 userid，不接受 @all
+     * @param title 消息标题，为空使用默认标题
+     * @param content 消息正文，清理标签后不能为空
+     * @param link 详情链接；空值为文本消息，非空为文本卡片
+     * @return NutMap：success 为全部批次被接口接受且无无效接收人；skipped 为未发送；
+     *         batches 为批次结果列表，每项包含 errcode、errmsg、msgid、invaliduser 等接口字段。
+     *         接口接受不代表用户已读；网络或配置错误抛出业务异常，不自动重发已接受批次。
+     */
+    NutMap massSend(List<String> loginNames, String title, String content, String link);
+}

src/main/java/com/budwk/app/base/wxwork/impl/WxWorkMessageServiceImpl.java

@@ -0,0 +1,189 @@
+package com.budwk.app.base.wxwork.impl;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.base.constant.RedisConstant;
+import com.budwk.app.base.wxwork.WxWorkMessageService;
+import com.budwk.app.web.commons.base.Globals;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.integration.jedis.RedisService;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.impl.PropertiesProxy;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+/** 企业微信官方消息接口；参考 ypi 的单发、群发及 token 缓存方式，配置与业务调用分离。 */
+@Slf4j
+@IocBean
+public class WxWorkMessageServiceImpl implements WxWorkMessageService {
+    private static final String PREFIX = "wxwork.message.";
+    private static final String API = "https://qyapi.weixin.qq.com/cgi-bin/";
+    @Inject
+    private PropertiesProxy conf;
+    @Inject
+    private RedisService redisService;
+
+    /** 参数和返回结构见接口；发送是外部操作，数据库事务无法撤回已发送的消息。 */
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public NutMap send(String loginname, String title, String content, String link) {
+        return massSend(loginname == null ? null : List.of(loginname), title, content, link);
+    }
+
+    /** 先判断独立消息开关，关闭时不读取凭据、不取 token，也不调用外部接口。 */
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public NutMap massSend(List<String> loginNames, String title, String content, String link) {
+        Object switchValue = Globals.MyConfig.get("AppWxWorkMessage");
+        boolean enabled = Boolean.parseBoolean(switchValue == null
+                ? conf.get(PREFIX + "enabled", "false") : switchValue.toString());
+        if (!enabled) {
+            return NutMap.NEW().addv("success", false).addv("skipped", true).addv("batches", List.of());
+        }
+        if (loginNames == null || loginNames.isEmpty()
+                || loginNames.stream().anyMatch(name -> StrUtil.isBlank(name) || name.contains("|") || name.trim().startsWith("@"))) {
+            throw new BaseException("企业微信接收人须为非空 loginname，不允许分隔符或群发标记");
+        }
+        List<String> receivers = loginNames.stream().map(String::trim).distinct().toList();
+        String body = plainText(content);
+        String heading = plainText(StrUtil.blankToDefault(title, conf.get(PREFIX + "default-title", "智慧工会")));
+        if (StrUtil.isBlank(body)) throw new BaseException("企业微信消息正文不能为空");
+        String url = resolveLink(link);
+        long agentId;
+        try {
+            agentId = Long.parseLong(required("wxwork.agentId"));
+            if (agentId <= 0) throw new NumberFormatException();
+        } catch (NumberFormatException e) {
+            throw new BaseException("企业微信 agentId 必须为正整数");
+        }
+        JSONObject payload = JSONUtil.createObj().set("agentid", agentId);
+        if (url == null) {
+            String text = heading + "\n" + body;
+            requireLength(text, 2048, "文本消息");
+            payload.set("msgtype", "text").set("text", JSONUtil.createObj().set("content", text));
+        } else {
+            requireLength(heading, 128, "卡片标题");
+            String description = HtmlUtil.escape(body).replace("\n", "<br>");
+            requireLength(description, 512, "卡片正文");
+            requireLength(url, 2048, "卡片链接");
+            payload.set("msgtype", "textcard").set("textcard", JSONUtil.createObj()
+                    .set("title", heading).set("description", description).set("url", url).set("btntxt", "查看详情"));
+        }
+        List<JSONObject> batches = new ArrayList<>();
+        boolean success = true;
+        // 企业微信 touser 单次最多 1000 人；按去重后的接收人分批，禁止自动重复整个批次列表。
+        for (int offset = 0; offset < receivers.size(); offset += 1000) {
+            payload.set("touser", String.join("|", receivers.subList(offset, Math.min(offset + 1000, receivers.size()))));
+            String token = getAccessToken(false);
+            JSONObject result = sendPayload(payload, token);
+            int code = result.getInt("errcode", -1);
+            // 仅在明确的 token 无效/过期返回时刷新一次；超时的发送结果不确定，不能盲目重发。
+            if (code == 40014 || code == 42001 || code == 40001) {
+                result = sendPayload(payload, getAccessToken(true));
+            }
+            batches.add(result);
+            boolean accepted = result.getInt("errcode", -1) == 0
+                    && StrUtil.isBlank(result.getStr("invaliduser"))
+                    && StrUtil.isBlank(result.getStr("unlicenseduser"));
+            success &= accepted;
+            log.info("企业微信消息批次完成：offset={}，success={}，errcode={}，msgid={}",
+                    offset, accepted, result.getInt("errcode"), result.getStr("msgid"));
+        }
+        return NutMap.NEW().addv("success", success).addv("skipped", false).addv("batches", batches);
+    }
+
+    /** 标题和富文本正文统一转换为可读纯文本，保留常用段落换行。 */
+    private String plainText(String value) {
+        return HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(value, "")
+                .replaceAll("(?i)<br\\s*/?>|</p>|</div>", "\n"))).trim();
+    }
+
+    /** 使用 UTF-8 字节数校验接口上限，避免中文按字符计数造成发送失败。 */
+    private void requireLength(String value, int limit, String label) {
+        if (value.getBytes(StandardCharsets.UTF_8).length > limit) {
+            throw new BaseException(label + "超过 " + limit + " 字节，请精简内容");
+        }
+    }
+
+    /** 相对路径按配置的系统域名补全；限制 HTTP(S)，避免生成不可打开的卡片链接。 */
+    private String resolveLink(String link) {
+        if (StrUtil.isBlank(link)) return null;
+        try {
+            URI uri = URI.create(link.trim());
+            if (!uri.isAbsolute()) {
+                if (uri.getRawAuthority() != null) throw new IllegalArgumentException();
+                String base = required(PREFIX + "link-base-url").replaceAll("/+$", "") + "/";
+                uri = URI.create(base).resolve(uri);
+            }
+            if (!("https".equalsIgnoreCase(uri.getScheme()) || "http".equalsIgnoreCase(uri.getScheme()))
+                    || uri.getHost() == null || uri.getUserInfo() != null) throw new IllegalArgumentException();
+            return uri.toASCIIString();
+        } catch (IllegalArgumentException e) {
+            throw new BaseException("企业微信详情链接或系统域名配置无效");
+        }
+    }
+
+    /** 按企业及应用隔离缓存，与登录 token 缓存分开；提前过期以避开有效期临界点。 */
+    private synchronized String getAccessToken(boolean refresh) {
+        String corpId = required("wxwork.corpId");
+        String agentId = required("wxwork.agentId");
+        String secret = required("wxwork.corpSecret");
+        String key = RedisConstant.REDIS_KEY_WX_WORK_TOKEN + "message:" + corpId + ":" + agentId;
+        String cached = refresh ? null : redisService.get(key);
+        if (StrUtil.isNotBlank(cached)) return cached;
+        JSONObject response = execute(HttpRequest.get(API + "gettoken?corpid=" + encode(corpId)
+                + "&corpsecret=" + encode(secret)));
+        String token = response.getStr("access_token");
+        if (response.getInt("errcode", -1) != 0 || StrUtil.isBlank(token)) {
+            throw new BaseException("企业微信获取 token 失败，errcode=" + response.getInt("errcode", -1));
+        }
+        int expires = response.getInt("expires_in", 7200);
+        redisService.setex(key, Math.max(1, expires - 120), token);
+        return token;
+    }
+
+    /** 提交已校验的消息 JSON；返回企业微信原始业务字段供调用方判断部分失败。 */
+    private JSONObject sendPayload(JSONObject payload, String token) {
+        return execute(HttpRequest.post(API + "message/send?access_token=" + encode(token))
+                .header("Content-Type", "application/json; charset=UTF-8").body(payload.toString()));
+    }
+
+    /** 关闭响应资源并校验 HTTP/JSON；异常不输出带 Secret 或 token 的请求 URL。 */
+    protected JSONObject execute(HttpRequest request) {
+        request.setConnectionTimeout(conf.getInt(PREFIX + "connect-timeout", 5000));
+        request.setReadTimeout(conf.getInt(PREFIX + "read-timeout", 10000));
+        try (HttpResponse response = request.execute()) {
+            if (!response.isOk()) throw new BaseException("企业微信接口 HTTP 状态异常：" + response.getStatus());
+            if (!JSONUtil.isTypeJSONObject(response.body())) throw new BaseException("企业微信接口返回非 JSON 对象");
+            return JSONUtil.parseObj(response.body());
+        } catch (BaseException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new BaseException("企业微信请求失败，请检查网络及接口配置；异常类型：" + e.getClass().getSimpleName());
+        }
+    }
+
+    /** 必填参数不允许为空或使用原有占位符 1，防止错误配置请求外部接口。 */
+    private String required(String key) {
+        String value = conf.get(key, "").trim();
+        if (StrUtil.isBlank(value) || "1".equals(value)) throw new BaseException("请配置有效的 " + key);
+        return value;
+    }
+
+    private String encode(String value) {
+        return URLEncoder.encode(value, StandardCharsets.UTF_8);
+    }
+}

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

@@ -21,6 +21,7 @@ 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;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
@@ -251,6 +252,15 @@ public class FlowCommonController {
     public Result revokeTask(@Param("taskId") Long taskId) {
         // 自己任务
         ProcessTask selfTask = dao.fetch(ProcessTask.class, taskId);
+        if ("startTask".equals(selfTask.getTaskName())) {
+            ProcessInstance instance = dao.fetch(ProcessInstance.class, selfTask.getProcessInstanceId());
+            if (instance != null && StrUtil.isNotBlank(instance.getBusinessNo())) {
+                DifficultHelpInfo helpInfo = dao.fetch(DifficultHelpInfo.class, instance.getBusinessNo());
+                if (helpInfo != null && !SecurityUtil.getUserId().equals(helpInfo.getCreatedBy())) {
+                    return Result.error("只能撤回自己创建的困难帮扶申请");
+                }
+            }
+        }
         selfTask.setTaskState(ProcessTaskStateEnum.DOING.getCode());
 
         // 撤销任务

src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java

@@ -0,0 +1,72 @@
+package com.budwk.app.flow.handler;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.lang.Lang;
+
+import java.util.List;
+
+public class FlowRecipientUnitSchoolLeaderHandler implements AssignmentHandler {
+
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        String businessNo = execution.getProcessInstance().getBusinessNo();
+        if (StrUtil.isBlank(businessNo)) {
+            throw new BaseException("申请记录编号不能为空。");
+        }
+        String processName = execution.getProcessModel().getName();
+        String unitId;
+        if ("KNBF".equals(processName)) {
+            DifficultHelpInfo difficultHelpInfo = dao.fetch(DifficultHelpInfo.class, businessNo);
+            if (difficultHelpInfo == null) {
+                throw new BaseException("未找到申请记录。");
+            }
+            unitId = difficultHelpInfo.getUnitId();
+        } else if ("ZGWW".equals(processName)) {
+            Condolence condolence = dao.fetch(Condolence.class, businessNo);
+            if (condolence == null) {
+                throw new BaseException("未找到申请记录。");
+            }
+            unitId = condolence.getHelpUnitId();
+        } else if ("TSWW".equals(processName)) {
+            com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence info = dao.fetch(
+                    com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence.class, businessNo);
+            if (info == null) throw new BaseException("未找到申请记录。");
+            unitId = info.getHelpUnitId();
+        } else {
+            throw new BaseException("当前流程不支持获取受助人所在单位分管校领导。");
+        }
+        if (StrUtil.isBlank(unitId)) {
+            throw new BaseException("受助人所在单位不能为空。");
+        }
+        SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
+        Sys_role role = sysRoleService.getByCode(RoleConstant.UNIT_SCHOOL_LEADER);
+        List<Sys_user_role> roles = dao.query(
+                Sys_user_role.class,
+                Cnd.where(Sys_user_role::getRoleId, "=", role.getId())
+                        .and(Sys_user_role::getUnitId, "=", unitId)
+        );
+        if (Lang.isEmpty(roles)) {
+            throw new BaseException("受助人/申请人所在单位未设置单位分管校领导，请联系校工会进行设置。");
+        }
+        return roles.stream().map(Sys_user_role::getUserId).distinct().toList();
+    }
+
+    @Override
+    public String getMessage() {
+        return "获取受助人所在单位分管校领导";
+    }
+}

src/main/java/com/budwk/app/flow/handler/FlowSchoolOfficeDirectorHandler.java

@@ -0,0 +1,44 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+
+import java.util.List;
+
+public class FlowSchoolOfficeDirectorHandler implements AssignmentHandler {
+
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        Sql sql = Sqls.create("""
+                SELECT
+                    userRole.userId
+                FROM
+                    `sys_user_role` userRole
+                    LEFT JOIN sys_role role ON role.id = userRole.roleId
+                WHERE
+                    role.`code` = @roleCode
+                GROUP BY
+                    userRole.userId
+                """).setParam("roleCode", RoleConstant.SCHOOL_OFFICE_DIRECTOR.name());
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        return sql.getList(String.class);
+    }
+
+    @Override
+    public String getMessage() {
+        return "获取校工会办公室主任";
+    }
+
+    @Override
+    public int getOrder() {
+        return AssignmentHandler.super.getOrder();
+    }
+}

src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java

@@ -0,0 +1,54 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+
+import java.util.List;
+
+/**
+ * 为校工会主席审核任务分配拥有校工会主席角色的用户。
+ */
+public class FlowSchoolUnionChairmanHandler implements AssignmentHandler {
+
+    /**
+     * 按校工会主席角色查询参与者，去除同一用户的重复角色记录。
+     *
+     * @param model 当前流程任务模型，无需额外传入人员参数
+     * @param execution 当前流程执行上下文，无需额外传入业务参数
+     * @return 用户 ID 列表，供流程引擎创建任务参与者；未配置角色用户时返回空列表
+     */
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        Sql sql = Sqls.create("""
+                SELECT
+                    userRole.userId
+                FROM
+                    `sys_user_role` userRole
+                    LEFT JOIN sys_role role ON role.id = userRole.roleId
+                WHERE
+                    role.`code` = @roleCode
+                GROUP BY
+                    userRole.userId
+                """).setParam("roleCode", RoleConstant.SCHOOL_UNION_CHAIRMAN.name());
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        return sql.getList(String.class);
+    }
+
+    @Override
+    public String getMessage() {
+        return "获取校工会主席";
+    }
+
+    @Override
+    public int getOrder() {
+        return AssignmentHandler.super.getOrder();
+    }
+}

src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionFinanceHandler.java

@@ -0,0 +1,54 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+
+import java.util.List;
+
+/**
+ * 为流程任务分配拥有校工会财务角色的用户。
+ */
+public class FlowSchoolUnionFinanceHandler implements AssignmentHandler {
+
+    /**
+     * 按校工会财务角色查询参与者，并去除重复的用户 ID。
+     *
+     * @param model 当前流程任务模型，无需额外传入人员参数
+     * @param execution 当前流程执行上下文，无需额外传入业务参数
+     * @return 用户 ID 列表；未配置角色或角色用户时返回空列表
+     */
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        Sql sql = Sqls.create("""
+                SELECT
+                    userRole.userId
+                FROM
+                    `sys_user_role` userRole
+                    LEFT JOIN sys_role role ON role.id = userRole.roleId
+                WHERE
+                    role.`code` = @roleCode
+                GROUP BY
+                    userRole.userId
+                """).setParam("roleCode", RoleConstant.SCHOOL_UNION_FINANCE.name());
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        return sql.getList(String.class);
+    }
+
+    /**
+     * 返回流程设计器中展示的参与者处理类名称。
+     *
+     * @return 流程设计器下拉选项名称
+     */
+    @Override
+    public String getMessage() {
+        return "获取校工会财务";
+    }
+}

src/main/java/com/budwk/app/flow/handler/FlowUnitSchoolLeaderHandler.java

@@ -0,0 +1,49 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+
+import java.util.List;
+
+/**
+ * 为分管校领导审核任务分配拥有 UNIT_SCHOOL_LEADER 角色的用户。
+ */
+public class FlowUnitSchoolLeaderHandler implements AssignmentHandler {
+
+    /**
+     * 按角色查询参与者，去除同一用户的重复角色记录。
+     *
+     * @param model 当前流程任务模型，无需额外传入人员参数
+     * @param execution 当前流程执行上下文，无需额外传入业务参数
+     * @return 用户 ID 列表，供流程引擎创建任务参与者；未配置角色用户时返回空列表
+     */
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        Sql sql = Sqls.create("""
+                SELECT
+                    userRole.userId
+                FROM
+                    sys_user_role userRole
+                    LEFT JOIN sys_role role ON role.id = userRole.roleId
+                WHERE
+                    role.`code` = @roleCode
+                GROUP BY
+                    userRole.userId
+                """).setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name());
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        return sql.getList(String.class);
+    }
+
+    @Override
+    public String getMessage() {
+        return "获取分管校领导";
+    }
+}

src/main/java/com/budwk/app/flow/listenter/ProcessTaskEndEventListener.java

@@ -4,6 +4,7 @@ import com.budwk.app.flow.engine.event.ProcessEvent;
 import com.budwk.app.flow.engine.event.ProcessEventListener;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessEventTypeEnum;
+import com.budwk.app.flow.service.SchoolOaTodoService;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -17,11 +18,16 @@ public class ProcessTaskEndEventListener implements ProcessEventListener {
     @Inject
     private Dao dao;
 
+    @Inject
+    private SchoolOaTodoService schoolOaTodoService;
+
     @Override
     public void onEvent(ProcessEvent event) {
         if (event.getEventType() == ProcessEventTypeEnum.PROCESS_TASK_END) {
             Long sourceId = event.getSourceId();
             ProcessTask task = dao.fetch(ProcessTask.class, sourceId);
+            // service 区分正常完成与废弃，只有正常完成才发送通达 status=2。
+            schoolOaTodoService.completeTodo(task);
             System.out.println("流程任务完成事件：" + task.getDisplayName());
         }
     }

src/main/java/com/budwk/app/flow/listenter/ProcessTaskRevokeEventListener.java

@@ -9,6 +9,7 @@ import com.budwk.app.flow.engine.event.ProcessEventListener;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessEventTypeEnum;
+import com.budwk.app.flow.service.SchoolOaTodoService;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -22,11 +23,16 @@ public class ProcessTaskRevokeEventListener implements ProcessEventListener {
     @Inject
     private Dao dao;
 
+    @Inject
+    private SchoolOaTodoService schoolOaTodoService;
+
     @Override
     public void onEvent(ProcessEvent event) {
         if(event.getEventType()== ProcessEventTypeEnum.PROCESS_TASK_REVOKE){
             Long taskId = event.getSourceId();
             ProcessTask task = dao.fetch(ProcessTask.class, taskId);
+            // 公开通达协议未定义取消，集中记录未同步事项，不把撤回冒充正常已办。
+            schoolOaTodoService.cancelTodo(task);
 
             String taskDisplayName = task.getDisplayName();
 

src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java

@@ -1,70 +1,27 @@
 package com.budwk.app.flow.listenter;
 
-import cn.hutool.core.util.StrUtil;
-import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.event.ProcessEvent;
 import com.budwk.app.flow.engine.event.ProcessEventListener;
-import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
-import com.budwk.app.flow.entity.ProcessTaskActor;
 import com.budwk.app.flow.enums.ProcessEventTypeEnum;
-import com.budwk.app.zhgh.dayofficework.message.service.GlobalMessageSendService;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.dao.Cnd;
+import com.budwk.app.flow.service.FlowTaskMessageService;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.json.Json;
-import org.nutz.lang.util.NutMap;
 
-import java.util.List;
-
-/**
- * 流程任务开始监听器
- */
+/** 普通节点、首次会签及转办任务统一从开始事件进入待办消息 service。 */
 @IocBean
-@Slf4j
 public class ProcessTaskStartEventListener implements ProcessEventListener {
-
     @Inject
     private Dao dao;
     @Inject
-    private GlobalMessageSendService globalMessageSendService;
+    private FlowTaskMessageService flowTaskMessageService;
 
     @Override
     public void onEvent(ProcessEvent event) {
         if (event.getEventType() == ProcessEventTypeEnum.PROCESS_TASK_START) {
-            Long sourceId = event.getSourceId();
-            ProcessTask task = dao.fetch(ProcessTask.class, sourceId);
-            sendMessage(task);
+            ProcessTask task = dao.fetch(ProcessTask.class, event.getSourceId());
+            flowTaskMessageService.notifyTask(task, false);
         }
     }
-
-
-    private void sendMessage(ProcessTask task) {
-        // 说明是流程开始 用户首次完成任务
-        if (task.getTaskParentId() == 0 && task.getTaskName().equals("startTask")) {
-            return;
-        }
-
-        // 节点名称
-        String taskDisplayName = task.getDisplayName();
-        // 实例名称
-        Long instanceId = task.getProcessInstanceId();
-        ProcessInstance instance = dao.fetch(ProcessInstance.class, instanceId);
-        String instanceName = Json.fromJson(NutMap.class, instance.getVariable()).getString(FlowConst.PROCESS_INSTANCE_NAME);
-
-        // 任务接收人
-        List<ProcessTaskActor> taskActors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
-
-        for (ProcessTaskActor taskActor : taskActors) {
-            // 模拟发送消息
-            String message = StrUtil.format("您有一条待办任务，实例：{}，处理环节：{}", taskActor.getActorName(), instanceName, taskDisplayName);
-            log.info(message);
-            globalMessageSendService.sendMessage(taskDisplayName, message, 2, List.of(taskActor.getActorId()), null);
-        }
-
-
-    }
-
 }

src/main/java/com/budwk/app/flow/service/FlowTaskMessageService.java

@@ -0,0 +1,132 @@
+package com.budwk.app.flow.service;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessDefine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.zhgh.dayofficework.message.service.GlobalMessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+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 java.net.URI;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/** WF 待办统一消息入口；站内消息、短信和企业微信沿用全局消息渠道。 */
+@IocBean
+@Slf4j
+public class FlowTaskMessageService {
+    private static final String HOME = "/platform/home";
+    private static final Set<String> TASK_PARAMS = Set.of("taskId", "bizId", "taskKey", "tab");
+    @Inject
+    private Dao dao;
+    @Inject
+    private GlobalMessageSendService globalMessageSendService;
+
+    /**
+     * task 为参与人已落库的 WF 任务；includeStartTask 仅驳回重建时传 true，
+     * 使退回申请人的 startTask 也收到通知，首次提交的申请节点不通知本人。
+     * 无返回值：仅通知进行中的任务，异常记录 taskId，不中断业务审核。
+     * config 的 wfTaskId 标识流程通知，wfLoginNames 为办理人的 loginname，
+     * wxWorkLink 为卡片地址；微信策略据此切换到官方企业微信接口。
+     */
+    @Aop(TransAop.READ_COMMITTED)
+    public void notifyTask(ProcessTask task, boolean includeStartTask) {
+        if (task == null || task.getId() == null || task.getProcessInstanceId() == null
+                || !ProcessTaskStateEnum.DOING.getCode().equals(task.getTaskState())) return;
+        if (!includeStartTask && "startTask".equals(task.getTaskName())
+                && (task.getTaskParentId() == null || task.getTaskParentId() == 0L)) return;
+        try {
+            ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+            if (instance == null) {
+                log.warn("WF 待办通知跳过：实例不存在，taskId={}", task.getId());
+                return;
+            }
+            ProcessDefine define = instance.getProcessDefineId() == null ? null
+                    : dao.fetch(ProcessDefine.class, instance.getProcessDefineId());
+            List<ProcessTaskActor> actors = dao.query(ProcessTaskActor.class,
+                    Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+            List<String> receiverIds = actors.stream().map(ProcessTaskActor::getActorId)
+                    .filter(StrUtil::isNotBlank).distinct().toList();
+            if (receiverIds.isEmpty()) {
+                log.warn("WF 待办通知跳过：任务没有实际办理人，taskId={}", task.getId());
+                return;
+            }
+            // 只用实际参与人的账号，不按角色扩大范围，不以内部用户 ID 代替企业微信 userid。
+            List<String> loginNames = actors.stream().filter(actor -> StrUtil.isNotBlank(actor.getActorId()))
+                    .map(ProcessTaskActor::getActorAccount).filter(StrUtil::isNotBlank)
+                    .map(String::trim).distinct().toList();
+            if (actors.stream().anyMatch(actor -> StrUtil.isBlank(actor.getActorAccount()))) {
+                log.warn("WF 待办存在未绑定 loginname 的办理人，taskId={}", task.getId());
+            }
+            String instanceName = define == null ? "流程审批" : StrUtil.blankToDefault(define.getDisplayName(), "流程审批");
+            if (StrUtil.isNotBlank(instance.getVariable())) {
+                try {
+                    instanceName = StrUtil.blankToDefault(JSONUtil.parseObj(instance.getVariable())
+                            .getStr(FlowConst.PROCESS_INSTANCE_NAME), instanceName);
+                } catch (Exception e) {
+                    log.warn("WF 实例名称解析失败，使用流程定义名称，taskId={}", task.getId());
+                }
+            }
+            String nodeName = StrUtil.blankToDefault(task.getDisplayName(), "待办审核");
+            String content = "您有一条待办任务，实例：" + instanceName + "，处理环节：" + nodeName;
+            JSONObject config = JSONUtil.createObj().set("wfTaskId", task.getId())
+                    .set("wfLoginNames", loginNames).set("wxWorkLink", buildLink(task, instance, define));
+            // 系统发送身份兼容定时推进等没有当前登录会话的流程入口。
+            globalMessageSendService.sendSystemMessage(nodeName, content, 2, receiverIds, config);
+        } catch (Exception e) {
+            log.error("WF 待办通知异常，taskId={}", task.getId(), e);
+        }
+    }
+
+    /** 优先节点手机表单；缺失或非法时回首页。保留原查询参数和锚点，替换过期任务参数。 */
+    private String buildLink(ProcessTask task, ProcessInstance instance, ProcessDefine define) {
+        String form = task.getH5FormKey();
+        // KNBF 历史定义中的办公室地址过时，沿用已经验证的实际审核入口。
+        if (define != null && "KNBF".equals(define.getName())
+                && "36ebafda-44c2-4bd3-bd7f-10839a575a0d".equals(task.getTaskName())) {
+            form = "/platform/difficultHelp/branchUnionApproval/h5";
+        }
+        if (StrUtil.isBlank(form) || "null".equalsIgnoreCase(form.trim())
+                || StrUtil.isBlank(instance.getBusinessNo()) || StrUtil.isBlank(task.getTaskName())) return HOME;
+        try {
+            form = form.trim();
+            URI uri = URI.create(form);
+            if (uri.getUserInfo() != null || (uri.isAbsolute()
+                    ? !("https".equalsIgnoreCase(uri.getScheme()) || "http".equalsIgnoreCase(uri.getScheme()))
+                        || uri.getHost() == null
+                    : !form.startsWith("/") || uri.getRawAuthority() != null)) return HOME;
+            List<String> params = new ArrayList<>();
+            if (StrUtil.isNotBlank(uri.getRawQuery())) {
+                for (String param : uri.getRawQuery().split("&")) {
+                    String key = URLDecoder.decode(param.split("=", 2)[0], StandardCharsets.UTF_8);
+                    if (!TASK_PARAMS.contains(key)) params.add(param);
+                }
+            }
+            params.add("taskId=" + task.getId());
+            params.add("bizId=" + URLEncoder.encode(instance.getBusinessNo(), StandardCharsets.UTF_8));
+            params.add("taskKey=" + URLEncoder.encode(task.getTaskName(), StandardCharsets.UTF_8));
+            params.add("tab=todo");
+            String base = form.split("[?#]", 2)[0];
+            return base + "?" + String.join("&", params)
+                    + (uri.getRawFragment() == null ? "" : "#" + uri.getRawFragment());
+        } catch (IllegalArgumentException e) {
+            log.warn("WF 手机表单地址无效，卡片回退首页，taskId={}", task.getId());
+            return HOME;
+        }
+    }
+}

src/main/java/com/budwk/app/flow/service/SchoolOaTodoService.java

@@ -0,0 +1,27 @@
+package com.budwk.app.flow.service;
+
+import com.budwk.app.flow.entity.ProcessTask;
+
+/** 通达 OA 待办同步入口，WF 调用方无需处理鉴权、人员映射或接口参数。 */
+public interface SchoolOaTodoService {
+    /**
+     * 推送已创建且已分配参与人的 WF 任务；首次自动提交的 startTask 不发送。
+     * @param task 包含任务 ID、实例 ID、状态和表单地址的完整任务
+     * @return 无返回值；开关关闭时跳过，开启后请求失败抛出业务异常
+     */
+    void createTodo(ProcessTask task);
+
+    /**
+     * 将已完成任务对应的接收人待办同步为 status=2；非完成状态不冒充已办。
+     * @param task 数据库中的完整任务，使用原发起人、接收人、标题和地址组装请求
+     * @return 无返回值；errcode=0 表示接口接受请求，原待办匹配规则仍需学校联调确认
+     */
+    void completeTodo(ProcessTask task);
+
+    /**
+     * 记录需取消的 OA 待办。通达公开文档未提供取消接口，本方法不发送虚构的删除请求。
+     * @param task 撤回、废弃或转办的原任务，用于记录任务 ID 和状态
+     * @return 无返回值；仅在开关开启时输出待人工处理提示，不代表 OA 已取消
+     */
+    void cancelTodo(ProcessTask task);
+}

src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java

@@ -26,9 +26,11 @@ import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.entity.ProcessTaskActor;
 import com.budwk.app.flow.enums.*;
+import com.budwk.app.flow.service.FlowTaskMessageService;
 import com.budwk.app.flow.service.ProcessDefineService;
 import com.budwk.app.flow.service.ProcessInstanceService;
 import com.budwk.app.flow.service.ProcessTaskService;
+import com.budwk.app.flow.service.SchoolOaTodoService;
 import com.budwk.app.flow.vo.ProcessTaskVO;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import org.nutz.aop.interceptor.ioc.TransAop;
@@ -56,6 +58,12 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
     @Inject
     private ProcessDefineService processDefineService;
 
+    @Inject
+    private SchoolOaTodoService schoolOaTodoService;
+
+    @Inject
+    private FlowTaskMessageService flowTaskMessageService;
+
     @Override
     public boolean save(ProcessTask param) {
         param.setId(null);
@@ -213,6 +221,8 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
         System.out.println("创建任务：" + processTask.getTaskName() + "," + processTask.getDisplayName());
         processTaskList.add(processTask);
         addTaskActor(processTask.getId(), getTaskActors(taskModel, execution));
+        // 参与人落库后统一推送通达待办，开始监听器不再重复推送。
+        schoolOaTodoService.createTodo(processTask);
 
         return processTaskList;
     }
@@ -284,6 +294,10 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
                 clone.setUpdatedBy(null);
                 dao().insert(clone);
                 addTaskActor(clone.getId(), CollectionUtil.newArrayList(actor));
+                // 并行加签绕过普通节点创建入口，需要为新增的个人任务同步待办。
+                schoolOaTodoService.createTodo(clone);
+                // 并行加签不经过 CreateTaskHandler，只为本次新增任务通知一次。
+                flowTaskMessageService.notifyTask(clone, false);
             });
 
         }
@@ -318,6 +332,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public ProcessTask rejectTask(ProcessModel model, ProcessTask currentTask) {
         Long taskParentId = currentTask.getTaskParentId();
         if (ObjectUtil.isEmpty(taskParentId) || taskParentId.equals(0L)) {
@@ -351,6 +366,10 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
         }
         saveProcessTask(task);
         addTaskActor(task.getId(), CollectionUtil.newArrayList(task.getOperator()));
+        // 驳回创建了新的任务 ID，按新任务推送，避免复用历史待办。
+        schoolOaTodoService.createTodo(task);
+        // 驳回重建不发布开始事件；退回申请节点时也通知申请人重新办理。
+        flowTaskMessageService.notifyTask(task, true);
         return task;
     }
 
@@ -424,10 +443,18 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
             System.out.println("创建会签任务：" + processTask.getTaskName() + "," + processTask.getDisplayName());
             processTaskList.add(processTask);
             addTaskActor(processTask.getId(), CollectionUtil.newArrayList(taskActor));
+            // 串行和并行会签均按实际生成的个人任务发送待办。
+            schoolOaTodoService.createTodo(processTask);
         });
         ProcessInstanceService processInstanceService = ServiceContext.find(ProcessInstanceService.class);
         // 更新会签变量到流程实例参数中
         processInstanceService.updateCountersignVariable(taskModel, execution, taskActors);
+        // 串行会签后续办理人由 CountersignHandler 直接创建，不经过开始事件；首次会签仍由监听器通知。
+        String counterPrefix = FlowConst.COUNTERSIGN_VARIABLE_PREFIX + taskModel.getName() + "_";
+        if (CountersignTypeEnum.SEQUENTIAL.equals(taskModel.getCountersignType())
+                && execution.getArgs().get(counterPrefix + FlowConst.LOOP_COUNTER, -1) >= 0) {
+            processTaskList.forEach(task -> flowTaskMessageService.notifyTask(task, false));
+        }
         return processTaskList;
     }
 
@@ -496,9 +523,12 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
 
         // 创建转办任务参与者
         addTaskActor(newTask.getId(), List.of(transferUserId));
+        // 通达取消协议待学校确认；先明确记录原待办未清理，再向新办理人推送。
+        schoolOaTodoService.cancelTodo(task);
+        schoolOaTodoService.createTodo(newTask);
 
         // 发布流程任务开始事件
-        List<ProcessTask> processTaskList = List.of(task);
+        List<ProcessTask> processTaskList = List.of(newTask);
         processTaskList.forEach(processTask -> {
             ProcessPublisher.notify(ProcessEvent.builder().eventType(ProcessEventTypeEnum.PROCESS_TASK_START).sourceId(processTask.getId()).build());
         });

src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java

@@ -0,0 +1,346 @@
+package com.budwk.app.flow.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.SchoolOaTodoService;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.web.commons.base.Globals;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.impl.PropertiesProxy;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.IdentityHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * 通达 V13 流程中心接口适配。所有配置、token 和 HTTP 请求集中在本服务。
+ * 接口依据：https://open.tongda2000.com/oa/v13/interface.html
+ * 同步请求失败向调用方抛出异常；本地事务不能撤销已经成功的远端请求。
+ */
+@Slf4j
+@IocBean
+public class SchoolOaTodoServiceImpl implements SchoolOaTodoService {
+    private static final String PREFIX = "school-oa.todo.";
+    @Inject
+    private Dao dao;
+    @Inject
+    private PropertiesProxy conf;
+
+    // token 由同步方法保护；实例内缓存有效期，避免每位接收人重复申请凭据。
+    private String accessToken;
+    private long tokenExpiresAt;
+    private String tokenConfig;
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void createTodo(ProcessTask task) {
+        if (!isEnabled()) return;
+        requireTask(task);
+        if (isInitialTask(task) || !ProcessTaskStateEnum.DOING.getCode().equals(task.getTaskState())) return;
+        sendTask(task, 1);
+    }
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void completeTodo(ProcessTask task) {
+        if (!isEnabled()) return;
+        requireTask(task);
+        if (isInitialTask(task)) return;
+        // 废弃任务也会发布结束事件；尤其提案附议仍可能可办理，不能直接改为 OA 已办。
+        if (!ProcessTaskStateEnum.FINISHED.getCode().equals(task.getTaskState())) {
+            cancelTodo(task);
+            return;
+        }
+        sendTask(task, 2);
+    }
+
+    @Override
+    public void cancelTodo(ProcessTask task) {
+        if (!isEnabled()) return;
+        requireTask(task);
+        if (isInitialTask(task)) return;
+        log.warn("通达OA取消规则尚未提供，本次未发送取消请求，请核对OA原待办：taskId={}，instanceId={}，state={}",
+                task.getId(), task.getProcessInstanceId(), task.getTaskState());
+    }
+
+    /**
+     * OA 待办接口联调尚未完成，暂时在代码中固定关闭，避免远端异常阻断内部 WF 流转。
+     * 不受 AppSchoolOa 或 enabled 配置影响；恢复对接时需显式恢复配置开关逻辑。
+     */
+    private boolean isEnabled() {
+        return false;
+    }
+
+    private void requireTask(ProcessTask task) {
+        if (task == null || task.getId() == null || task.getProcessInstanceId() == null) {
+            throw new BaseException("通达OA同步失败：任务或流程实例ID为空");
+        }
+    }
+
+    private boolean isInitialTask(ProcessTask task) {
+        return Long.valueOf(0L).equals(task.getTaskParentId()) && "startTask".equals(task.getTaskName());
+    }
+
+    /**
+     * task 为完整 WF 任务；status 只允许本服务传入 1（待办）或 2（已办）。
+     * sender/recipient 使用学校绑定的第三方用户标识；content 为 JSON 字符串，url 为 UTF-8 Base64。
+     * 每个接收人单独请求，响应 JSON 中必须有 errcode=0；不采用参考项目的 uniqueId/state 协议。
+     */
+    private void sendTask(ProcessTask task, int status) {
+        ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+        if (instance == null) throw new BaseException("通达OA同步失败：流程实例不存在");
+        Sys_user sender = dao.fetch(Sys_user.class, instance.getOperator());
+        if (sender == null) throw new BaseException("通达OA同步失败：流程发起人不存在");
+        List<ProcessTaskActor> actors = dao.query(ProcessTaskActor.class,
+                Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
+        if (actors.isEmpty()) throw new BaseException("通达OA同步失败：任务参与人为空");
+
+        String senderId = userIdentifier(sender.getId(), sender.getLoginname());
+        String title = StrUtil.blankToDefault(JSONUtil.parseObj(StrUtil.blankToDefault(instance.getVariable(), "{}"))
+                .getStr(FlowConst.PROCESS_INSTANCE_NAME), "流程申请") + " - " + task.getDisplayName();
+        String targetUrl = buildTaskUrl(task, instance);
+        String systemParam = conf.get(PREFIX + "system-id-param", "clientid");
+        if (!"clientid".equals(systemParam) && !"exsId".equals(systemParam)) {
+            throw new BaseException("通达OA配置 system-id-param 仅支持 clientid 或 exsId");
+        }
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put(systemParam, requireConfig("system-id"));
+        params.put("status", status);
+        params.put("sender", senderId);
+        params.put("content", JSONUtil.quote(title));
+        params.put("url", Base64.getEncoder().encodeToString(targetUrl.getBytes(StandardCharsets.UTF_8)));
+        // 先校验全部人员，避免处理到中途才发现缺少账号；不假设本地用户 ID 就是 OA 用户 ID。
+        List<String> recipients = actors.stream()
+                .filter(actor -> !FlowConst.ADMIN_ID.equals(actor.getActorId())
+                        && !"superadmin".equalsIgnoreCase(actor.getActorAccount()))
+                .map(actor -> userIdentifier(actor.getActorId(), actor.getActorAccount())).distinct().toList();
+        for (String recipient : recipients) {
+            params.put("recipient", recipient);
+            String endpoint = baseUrl() + "/restapi/1_0/appcenter/affairprocessing?" + encodeParams(params);
+            JSONObject result = execute(HttpRequest.get(endpoint).header("Authorization", "Bearer " + getAccessToken()), "待办同步");
+            Integer errorCode = result.getInt("errcode");
+            if (errorCode == null || errorCode != 0) {
+                String detail = responseError(result);
+                log.error("通达OA待办业务失败，taskId={}，instanceId={}，status={}，errcode={}，detail={}",
+                        task.getId(), task.getProcessInstanceId(), status, errorCode, detail);
+                throw new BaseException("通达OA待办同步失败：errcode={}，taskId={}，{}", errorCode, task.getId(), detail);
+            }
+            log.info("通达OA接受待办同步请求，taskId={}，status={}", task.getId(), status);
+        }
+    }
+
+    /** 用户映射按学校绑定选择 loginname 或 id，发送人与接收人使用同一规则。 */
+    private String userIdentifier(String id, String account) {
+        String mode = conf.get(PREFIX + "user-id-mode", "loginname");
+        if (!"loginname".equals(mode) && !"id".equals(mode)) {
+            throw new BaseException("通达OA配置 user-id-mode 仅支持 loginname 或 id");
+        }
+        String value = "id".equals(mode) ? id : account;
+        if (StrUtil.isBlank(value) || value.contains(",")) {
+            throw new BaseException("通达OA同步失败：绑定用户标识为空或包含逗号");
+        }
+        return value;
+    }
+
+    /** 通达仅有一个 url 字段，沿用当前 PC 审核页并携带任务、实例及业务参数。 */
+    private String buildTaskUrl(ProcessTask task, ProcessInstance instance) {
+        String form = task.getFormKey();
+        if (StrUtil.isBlank(form)) throw new BaseException("通达OA同步失败：任务PC表单地址为空");
+        String url = form.startsWith("http://") || form.startsWith("https://") ? form
+                : StrUtil.removeSuffix(Globals.AppDomain, "/") + "/" + StrUtil.removePrefix(form, "/");
+        // 原表单带锚点时，查询参数必须放在 # 前，否则服务端收不到 taskId。
+        int fragmentIndex = url.indexOf('#');
+        String fragment = fragmentIndex < 0 ? "" : url.substring(fragmentIndex);
+        if (fragmentIndex >= 0) url = url.substring(0, fragmentIndex);
+        Map<String, Object> query = new LinkedHashMap<>();
+        query.put("taskId", task.getId());
+        query.put("instanceId", instance.getId());
+        query.put("bizId", StrUtil.nullToEmpty(instance.getBusinessNo()));
+        query.put("taskKey", StrUtil.nullToEmpty(task.getTaskName()));
+        return url + (url.contains("?") ? "&" : "?") + encodeParams(query) + fragment;
+    }
+
+    /**
+     * POST /oauth2/token：client_secret 必须是学校提供的 AES 加密结果，不是明文密钥。
+     * 返回 access_token 和 expires_in（秒）；缓存提前过期，配置变化立即重新申请。
+     */
+    private synchronized String getAccessToken() {
+        String base = baseUrl();
+        String clientId = requireConfig("client-id");
+        String secret = requireConfig("client-secret-encrypted");
+        String username = conf.get(PREFIX + "token-username", "username");
+        String password = conf.get(PREFIX + "token-password", "password");
+        String currentConfig = JSONUtil.toJsonStr(List.of(base, clientId, secret, username, password));
+        long now = System.currentTimeMillis();
+        if (currentConfig.equals(tokenConfig) && StrUtil.isNotBlank(accessToken) && now < tokenExpiresAt) {
+            // 只记录缓存剩余有效期，便于区分复用与重新获取，不输出凭据。
+            log.info("通达OA复用token缓存，remainingSeconds={}", (tokenExpiresAt - now) / 1000L);
+            return accessToken;
+        }
+        Map<String, Object> form = new LinkedHashMap<>();
+        form.put("grant_type", "password");
+        form.put("client_id", clientId);
+        form.put("client_secret", secret);
+        form.put("username", username);
+        form.put("password", password);
+        long startedAt = System.nanoTime();
+        JSONObject result = execute(HttpRequest.post(base + "/oauth2/token")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .body(encodeParams(form)), "获取凭据");
+        String token = result.getStr("access_token");
+        Long expires = result.getLong("expires_in");
+        if (StrUtil.isBlank(token) || expires == null || expires <= 0 || expires > Integer.MAX_VALUE) {
+            String detail = responseError(result);
+            log.error("通达OA获取凭据业务失败，缺少有效的 access_token 或 expires_in，detail={}", detail);
+            throw new BaseException("通达OA获取凭据失败：缺少有效的 access_token 或 expires_in，{}", detail);
+        }
+        accessToken = token;
+        tokenConfig = currentConfig;
+        tokenExpiresAt = now + (expires - Math.min(60, expires / 10)) * 1000L;
+        log.info("通达OA获取token成功，elapsedMs={}，expiresInSeconds={}",
+                (System.nanoTime() - startedAt) / 1_000_000, expires);
+        return token;
+    }
+
+    /** HTTP 成功不代表业务成功；本方法只验证状态码和 JSON，业务码由调用处校验。 */
+    private JSONObject execute(HttpRequest request, String action) {
+        long startedAt = System.nanoTime();
+        int timeout = conf.getInt(PREFIX + "timeout-ms", 10000);
+        // 只记录接口地址，不记录 GET 查询参数、请求头或 token 请求正文。
+        String endpoint = request.getUrl().split("[?#]", 2)[0];
+        try (HttpResponse response = request.timeout(timeout).execute()) {
+            String body = response.body();
+            boolean jsonObject = JSONUtil.isTypeJSONObject(body);
+            // 非 JSON 错误常为 OA 或网关的 HTML 页面；仅在日志保留脱敏摘要，不把页面返回给前端。
+            if (!jsonObject) {
+                log.error("通达OA非JSON响应，action={}，method={}，endpoint={}，httpStatus={}，contentType={}，bodySummary={}",
+                        action, request.getMethod(), endpoint, response.getStatus(),
+                        redact(response.header("Content-Type")), responseBodySummary(body));
+            }
+            if (!response.isOk()) {
+                if (response.getStatus() == 401) invalidateToken();
+                String detail = jsonObject
+                        ? responseError(JSONUtil.parseObj(body)) : "响应不是JSON对象，脱敏响应摘要请查看服务端日志";
+                throw new BaseException("通达OA{}失败：HTTP {}，{}", action, response.getStatus(), detail);
+            }
+            if (!jsonObject) throw new BaseException("通达OA{}失败：响应不是JSON对象，脱敏响应摘要请查看服务端日志", action);
+            return JSONUtil.parseObj(body);
+        } catch (Exception e) {
+            long elapsed = (System.nanoTime() - startedAt) / 1_000_000;
+            Throwable root = e;
+            Map<Throwable, Boolean> visited = new IdentityHashMap<>();
+            while (root.getCause() != null && visited.put(root, Boolean.TRUE) == null
+                    && !visited.containsKey(root.getCause())) root = root.getCause();
+            String detail = root.getClass().getName() + ": " + redact(root.getMessage());
+            // 保留各层原因、原始栈帧及 suppressed 异常；先复制脱敏，避免全局异常处理器泄露凭证。
+            Throwable safeCause = diagnosticCause(e, new IdentityHashMap<>());
+            log.error("通达OA请求失败，action={}，method={}，endpoint={}，elapsedMs={}，timeoutMs={}，rootCause={}",
+                    action, request.getMethod(), endpoint, elapsed, timeout, detail, safeCause);
+            // 不自动重放写请求，超时可能发生在远端已成功之后；避免重复待办。
+            BaseException failure = new BaseException("通达OA{}失败，耗时{}ms：{}；请核对远端结果后再重试", action, elapsed, detail);
+            failure.initCause(safeCause);
+            throw failure;
+        }
+    }
+
+    /** body 为远端非 JSON 正文；先脱敏再截取最多 2000 字符，避免截断凭据后无法匹配脱敏。 */
+    private String responseBodySummary(String body) {
+        if (StrUtil.isBlank(body)) return "[空响应正文]";
+        String safe = redact(body);
+        return safe.length() > 2000 ? safe.substring(0, 2000) + "[已截断]" : safe;
+    }
+
+    /** 只提取接口错误字段，不输出含 access_token、refresh_token 等内容的整个响应。 */
+    private String responseError(JSONObject response) {
+        Map<String, Object> errors = new LinkedHashMap<>();
+        for (String key : List.of("error", "error_description", "errcode", "errmsg", "message")) {
+            if (response.containsKey(key)) errors.put(key, redact(String.valueOf(response.get(key))));
+        }
+        return errors.isEmpty() ? "OA未返回错误说明" : JSONUtil.toJsonStr(errors);
+    }
+
+    /**
+     * 复制异常诊断信息，message 标注原异常类型，保留原始栈帧和原因链。
+     * visited 防止第三方异常存在循环引用；原异常不修改，也不直接写入日志。
+     */
+    private Throwable diagnosticCause(Throwable source, Map<Throwable, Throwable> visited) {
+        if (visited.containsKey(source)) return visited.get(source);
+        RuntimeException copy = new RuntimeException(source.getClass().getName() + ": " + redact(source.getMessage()));
+        visited.put(source, copy);
+        copy.setStackTrace(source.getStackTrace());
+        if (source.getCause() != null && !visited.containsKey(source.getCause())) {
+            copy.initCause(diagnosticCause(source.getCause(), visited));
+        }
+        for (Throwable suppressed : source.getSuppressed()) {
+            if (!visited.containsKey(suppressed)) copy.addSuppressed(diagnosticCause(suppressed, visited));
+        }
+        return copy;
+    }
+
+    /** 清除已知凭证及可能被远端回显的认证字段、URL查询参数，并移除日志换行。 */
+    private String redact(String message) {
+        if (message == null) return "无异常说明";
+        String text = message;
+        for (String key : List.of("client-secret-encrypted", "token-password", "client-id")) {
+            String value = conf.get(PREFIX + key);
+            if (StrUtil.isNotBlank(value)) {
+                text = text.replace(value, "[REDACTED]")
+                        .replace(URLEncoder.encode(value, StandardCharsets.UTF_8), "[REDACTED]");
+            }
+        }
+        if (StrUtil.isNotBlank(accessToken)) text = text.replace(accessToken, "[REDACTED]");
+        text = text.replaceAll("(?i)Bearer\\s+[^\\s,;\\\"']+", "Bearer [REDACTED]");
+        text = text.replaceAll("(?i)((?:client_secret|access_token|refresh_token|password|authorization)[\\\"']?\\s*[:=]\\s*)[\\\"']?[^\\s&,;}\\\"']+[\\\"']?", "$1[REDACTED]");
+        text = text.replaceAll("(https?://[^\\s?#]+)\\?[^\\s]+", "$1?[REDACTED]");
+        return text.replace('\r', ' ').replace('\n', ' ');
+    }
+
+    private synchronized void invalidateToken() {
+        accessToken = null;
+        tokenExpiresAt = 0;
+    }
+
+    private String baseUrl() {
+        String value = requireConfig("base-url");
+        URI uri = URI.create(value);
+        if ((!"http".equals(uri.getScheme()) && !"https".equals(uri.getScheme()))
+                || uri.getHost() == null || uri.getQuery() != null || uri.getFragment() != null || uri.getUserInfo() != null) {
+            throw new BaseException("通达OA base-url 必须为不含账号、查询参数和锚点的HTTP(S)地址");
+        }
+        return StrUtil.removeSuffix(value, "/");
+    }
+
+    private String requireConfig(String key) {
+        String value = conf.get(PREFIX + key);
+        if (StrUtil.isBlank(value)) throw new BaseException("通达OA配置 {} 未填写", PREFIX + key);
+        return value.trim();
+    }
+
+    /** 每个参数单独编码，保留标题中的中文、引号及 Base64 中的 +、/、=。 */
+    private String encodeParams(Map<String, Object> params) {
+        return params.entrySet().stream().map(entry -> URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8)
+                + "=" + URLEncoder.encode(String.valueOf(entry.getValue()), StandardCharsets.UTF_8))
+                .collect(Collectors.joining("&"));
+    }
+}

src/main/java/com/budwk/app/sys/controller/SysRoleController.java

@@ -37,6 +37,7 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.GET;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
+import org.nutz.mvc.annotation.POST;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -499,6 +500,24 @@ public class SysRoleController {
         return Result.success(list);
     }
 
+    /**
+     * 为全部 member=1 的用户设置会员角色，无需传入用户 ID、角色 ID 或列表筛选参数。
+     *
+     * @return JSON Result，data.addedCount 为新增关联数，data.enabledCount 为恢复启用关联数
+     */
+    @At
+    @POST
+    @Ok("json")
+    @SaCheckPermission("sys.manager.role.user")
+    @SLog(tag = "一键设置会员角色", msg = "为全部member=1的人员补齐会员角色")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result doSettingMemberRole() {
+        NutMap counts = sysRoleService.settingMemberRole();
+        sysRoleService.clearCache();
+        sysUserService.clearCache();
+        return Result.success("会员角色设置完成", counts);
+    }
+
     @At
     @Ok("json")
     @SaCheckPermission("sys.manager.role")

src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java

@@ -11,7 +11,8 @@ import java.util.Map;
 public interface SysDataUserPullService extends BaseService<Sys_user_source> {
 
     /**
-     * 从信息中心拉取数据
+     * 从本地中间表同步单位，并将人员写入 sys_user_source 快照；不更新 sys_user。
+     * 返回本次人员快照的拉取时间。
      */
     Date pull();
 

src/main/java/com/budwk/app/sys/services/SysRoleService.java

@@ -8,6 +8,7 @@ import com.budwk.app.sys.models.Sys_role;
 import com.budwk.app.sys.models.Sys_unit;
 
 import java.util.List;
+import org.nutz.lang.util.NutMap;
 
 /**
  * Created by wizzer on 2016/12/22.
@@ -128,6 +129,13 @@ public interface SysRoleService extends BaseService<Sys_role> {
      */
     List<String> getRoleIdsByCode(List<RoleConstant> roleConstantList);
 
+    /**
+     * 为用户表中 member=1 的全部人员补齐启用的 MEMBER 角色，不受列表筛选影响。
+     *
+     * @return addedCount 为新增关联数，enabledCount 为恢复启用的关联数；已有启用关联不重复添加
+     */
+    NutMap settingMemberRole();
+
     /**
      * 清空缓存
      */

src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java

@@ -1,15 +1,6 @@
 package com.budwk.app.sys.services.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.http.Header;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.config.DataCenterProperties;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.sys.models.Sys_unit;
@@ -17,41 +8,24 @@ import com.budwk.app.sys.services.SysDataUnitPullService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
 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 java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
- * @version 1.0
- * @Author zzr
- * @name：SysDataUnitPullServiceImpl
- * @Date 2025/9/15 17:52
- * @注释
+ * 将本地单位中间表同步到系统单位表。
  */
 @Slf4j
 @IocBean(args = {"refer:dao"})
 public class SysDataUnitPullServiceImpl extends BaseServiceImpl<Sys_unit> implements SysDataUnitPullService {
 
-    private static final String DMP_UNIT_KEY = "unit";
-    private static final int DMP_PAGE_SIZE = 1000;
-
-    @Inject
-    private DataCenterProperties dataCenterProperties;
-
     public SysDataUnitPullServiceImpl(Dao dao) {
         super(dao);
     }
 
-
     @Override
     @Aop(TransAop.READ_COMMITTED)
     public void updateUnits() {
@@ -59,240 +33,65 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl<Sys_unit> implem
     }
 
     /**
-     * 拉取单位数据
+     * 从 unit_middle 同步全部二级单位。
+     * unitIds 是旧调用链传入的已有单位 ID 列表；中间表同步按全表执行，不依赖此参数。
+     * 返回值为空；已存在单位只更新中间表明确提供的字段。
      */
     @Override
     @Aop(TransAop.READ_COMMITTED)
     public void updateUnits(List<String> unitIds) {
-        String accessToken = getDmpAccessToken();
-        List<JSONObject> rawDataList = distinctDmpUnits(pullDmpUnits(getDmpUnitUrl(), accessToken));
-        Set<String> parentCodes = rawDataList.stream()
-                .map(this::getNormalizedParentCode)
-                .filter(StrUtil::isNotBlank)
-                .collect(Collectors.toSet());
-
-        rawDataList.stream()
-                .sorted(Comparator.comparingInt(this::getUnitLevel))
-                .forEach(raw -> saveOrUpdateUnit(raw, parentCodes));
-
-        log.info("信息中心单位数据同步完成，本次接口返回单位数量: {}，待检查单位编码数量: {}", rawDataList.size(), unitIds == null ? 0 : unitIds.size());
-    }
-
-    /**
-     * 获取信息中心开放平台访问令牌。
-     * 参数来自 data-center.token-url、data-center.key、data-center.secret；
-     * 返回值为后续单位接口 body 中 access_token 使用的字符串。
-     */
-    private String getDmpAccessToken() {
-        String tokenUrl = dataCenterProperties.getTokenUrl();
-        if (StrUtil.isBlank(tokenUrl)) {
-            throw new BaseException("未配置信息中心token地址: data-center.token-url");
-        }
-        String key = dataCenterProperties.getKey();
-        if (StrUtil.isBlank(key)) {
-            throw new BaseException("未配置信息中心token key: data-center.key");
-        }
-        String secret = dataCenterProperties.getSecret();
-        if (StrUtil.isBlank(secret)) {
-            throw new BaseException("未配置信息中心token secret: data-center.secret");
+        List<NutMap> middleUnits = listMap(Sqls.create("SELECT DWDM, DWMC, BMFLMC FROM unit_middle"));
+        if (middleUnits.isEmpty()) {
+            throw new BaseException("本地单位中间表没有数据，已停止同步");
         }
 
-        String params = URLUtil.buildQuery(Map.of("key", key, "secret", secret), StandardCharsets.UTF_8);
-        String tokenResBody = HttpUtil.createGet(tokenUrl + "?" + params).execute().body();
-        JSONObject tokenJsonBody = JSONUtil.parseObj(tokenResBody);
-        String accessToken = tokenJsonBody.getStr("access_token");
-        if (StrUtil.isBlank(accessToken) && tokenJsonBody.getJSONObject("result") != null) {
-            accessToken = tokenJsonBody.getJSONObject("result").getStr("access_token");
-        }
-        if (StrUtil.isBlank(accessToken) && tokenJsonBody.getJSONObject("data") != null) {
-            accessToken = tokenJsonBody.getJSONObject("data").getStr("access_token");
-        }
-        if (StrUtil.isBlank(accessToken)) {
-            accessToken = tokenJsonBody.getStr("token");
-        }
-        if (StrUtil.isBlank(accessToken)) {
-            throw new BaseException("获取信息中心token失败");
-        }
-        return accessToken;
-    }
-
-    /**
-     * 读取信息中心单位接口地址。
-     * 配置项为 data-center.urls.unit，返回值为单位全量接口URL。
-     */
-    private String getDmpUnitUrl() {
-        String url = dataCenterProperties.getUrls().get(DMP_UNIT_KEY);
-        if (StrUtil.isBlank(url)) {
-            throw new BaseException("未配置信息中心单位接口地址: data-center.urls." + DMP_UNIT_KEY);
-        }
-        return url;
-    }
-
-    /**
-     * 分页拉取单位接口数据。
-     * 入参 url 为单位接口地址，accessToken 为信息中心令牌；
-     * 请求 body 包含 access_token、per_page、page；
-     * 返回值为 result.data 合并后的单位原始 JSON 列表。
-     */
-    private List<JSONObject> pullDmpUnits(String url, String accessToken) {
-        List<JSONObject> rawDataList = new ArrayList<>();
-        int page = 1;
-        int maxPage = 1;
-        int total = 0;
-
-        do {
-            HttpRequest httpRequest = HttpUtil.createPost(url);
-            httpRequest.header(Header.CONTENT_TYPE, "application/json");
-            httpRequest.body(JSONUtil.toJsonStr(Map.of(
-                    "access_token", accessToken,
-                    "per_page", String.valueOf(DMP_PAGE_SIZE),
-                    "page", String.valueOf(page)
-            )));
-
-            log.info("请求信息中心单位数据，第{}页: {}", page, httpRequest);
-            String resBody = httpRequest.execute().body();
-            log.info("请求信息中心单位数据第{}页结果: {}", page, resBody);
-            JSONObject jsonBody = JSONUtil.parseObj(resBody);
-
-            if (jsonBody.getInt("code") != 10000) {
-                throw new BaseException("获取信息中心单位数据失败，错误码: " + jsonBody.getInt("code") + "；错误原因：" + jsonBody.getStr("message"));
+        for (NutMap raw : middleUnits) {
+            String unitCode = StrUtil.trim(raw.getString("DWDM"));
+            String unitName = StrUtil.trim(raw.getString("DWMC"));
+            if (StrUtil.isBlank(unitCode) || unitCode.length() != 3 || StrUtil.isBlank(unitName)) {
+                throw new BaseException("单位中间表存在无效的二级单位代码或名称，已停止同步");
             }
 
-            JSONObject result = jsonBody.getJSONObject("result");
-            if (result == null) {
-                break;
+            Sys_unit unit = fetch(unitCode);
+            if (unit == null) {
+                unit = new Sys_unit();
+                unit.setId(unitCode);
+                unit.setParentId("0");
+                unit.setPath(getUnitPath("0"));
+                unit.setAliasName(unitName);
+                unit.setUnitTypeCode(1);
+                unit.setHasChildren(false);
+                unit.setName(unitName);
+                unit.setUnitcode(unitCode);
+                unit.setUnitLevel(2);
+                if (StrUtil.isNotBlank(raw.getString("BMFLMC"))) {
+                    unit.setUnitType(raw.getString("BMFLMC"));
+                }
+                dao().fastInsert(unit);
+            } else {
+                unit.setName(unitName);
+                unit.setUnitcode(unitCode);
+                unit.setUnitLevel(2);
+                unit.setUnitTypeCode(1);
+                unit.setParentId("0");
+                if (StrUtil.isBlank(unit.getPath())) {
+                    unit.setPath(getUnitPath("0"));
+                }
+                if (StrUtil.isNotBlank(raw.getString("BMFLMC"))) {
+                    unit.setUnitType(raw.getString("BMFLMC"));
+                }
+                dao().updateIgnoreNull(unit);
             }
-            total = result.getInt("total", total);
-            maxPage = result.getInt("max_page", maxPage);
-            JSONArray data = result.getJSONArray("data");
-            if (CollUtil.isNotEmpty(data)) {
-                rawDataList.addAll(data.stream().map(v -> (JSONObject) v).toList());
-            }
-            log.info("信息中心单位数据拉取进度: {}/{}", rawDataList.size(), total);
-            page++;
-        } while (page <= maxPage);
-
-        return rawDataList;
+        }
+        log.info("本地单位中间表同步完成，单位数量: {}", middleUnits.size());
     }
 
     /**
-     * 按单位代码去重，避免接口分页或源数据重复导致同一 DWDM 重复写入。
-     */
-    private List<JSONObject> distinctDmpUnits(List<JSONObject> rawDataList) {
-        Map<String, JSONObject> unitMap = new LinkedHashMap<>();
-        for (JSONObject raw : rawDataList) {
-            String unitCode = raw.getStr("DWDM");
-            if (StrUtil.isBlank(unitCode)) {
-                continue;
-            }
-            unitMap.putIfAbsent(unitCode, raw);
-        }
-        return new ArrayList<>(unitMap.values());
-    }
-
-    /**
-     * 保存或更新单位。
-     * DWDM 对应系统单位 id/unitcode，DWMC 对应名称，LSDWH 对应父级单位号，DWCC 对应信息中心原始单位层级。
-     */
-    private void saveOrUpdateUnit(JSONObject raw, Set<String> parentCodes) {
-        String unitCode = raw.getStr("DWDM");
-        if (StrUtil.isBlank(unitCode)) {
-            return;
-        }
-
-        String parentId = getParentId(unitCode, getNormalizedParentCode(raw));
-        Sys_unit unit = fetch(unitCode);
-        if (unit == null) {
-            unit = new Sys_unit();
-            unit.setId(unitCode);
-            unit.setUnitcode(unitCode);
-            unit.setPath(getUnitPath(parentId));
-            setUnitValue(unit, raw, parentId, parentCodes);
-            dao().fastInsert(unit);
-        } else {
-            setUnitValue(unit, raw, parentId, parentCodes);
-            if (StrUtil.isBlank(unit.getPath())) {
-                unit.setPath(getUnitPath(parentId));
-            }
-            dao().updateIgnoreNull(unit);
-        }
-    }
-
-    /**
-     * 根据接口字段给系统单位赋值。
-     * DWYXBS 表示单位是否有效，DWCC 表示信息中心原始单位层次；
-     * 系统内置根单位占用一级层级，因此保存时统一将 DWCC 加一。
-     */
-    private void setUnitValue(Sys_unit unit, JSONObject raw, String parentId, Set<String> parentCodes) {
-        String unitCode = raw.getStr("DWDM");
-        String unitName = raw.getStr("DWMC");
-        String aliasName = StrUtil.blankToDefault(raw.getStr("DWJC"), unitName);
-        Integer rawUnitLevel = raw.getInt("DWCC");
-        Integer unitLevel = getNormalizedUnitLevel(raw);
-        boolean availableBusinessUnit = "是".equals(raw.getStr("DWYXBS")) && Integer.valueOf(2).equals(rawUnitLevel);
-
-        unit.setParentId(parentId);
-        unit.setName(unitName);
-        unit.setAliasName(aliasName);
-        unit.setUnitcode(unitCode);
-        unit.setAddress(raw.getStr("DWDZ"));
-        unit.setUnitLevel(unitLevel);
-        unit.setUnitType(raw.getStr("DWLB"));
-        unit.setUnitTypeCode(availableBusinessUnit ? 1 : 0);
-        unit.setHasChildren(parentCodes.contains(unitCode));
-    }
-
-    /**
-     * 计算父级单位号。
-     * LSDWH 为空、等于自身或本地不存在该父级时按根级处理；系统根单位 0 允许直接作为父级。
-     */
-    private String getParentId(String unitCode, String parentCode) {
-        if (StrUtil.isBlank(parentCode) || unitCode.equals(parentCode)) {
-            return "";
-        }
-        if ("0".equals(parentCode)) {
-            return parentCode;
-        }
-        Sys_unit parentUnit = fetch(parentCode);
-        return parentUnit == null ? "" : parentCode;
-    }
-
-    /**
-     * 根据父级 path 生成当前单位 path。
-     * 父级为空时生成根节点 path，父级存在时在父级 path 下生成子节点 path。
+     * 按系统根单位的 path 生成新二级单位路径，供单位树正常展示。
      */
     private String getUnitPath(String parentId) {
-        String parentPath = "";
-        if (StrUtil.isNotBlank(parentId)) {
-            Sys_unit parentUnit = fetch(parentId);
-            parentPath = parentUnit == null ? "" : parentUnit.getPath();
-        }
+        Sys_unit parentUnit = fetch(parentId);
+        String parentPath = parentUnit == null ? "" : parentUnit.getPath();
         return getSubPath("sys_unit", "path", parentPath);
     }
-
-    /**
-     * 信息中心一级单位应挂在系统根单位 0 下，其余单位沿用接口返回的 LSDWH。
-     */
-    private String getNormalizedParentCode(JSONObject raw) {
-        Integer rawUnitLevel = raw.getInt("DWCC");
-        if (Integer.valueOf(1).equals(rawUnitLevel)) {
-            return "0";
-        }
-        return raw.getStr("LSDWH");
-    }
-
-    /**
-     * 系统内置根单位占用一级层级，信息中心单位层次入库时统一加一。
-     */
-    private Integer getNormalizedUnitLevel(JSONObject raw) {
-        Integer rawUnitLevel = raw.getInt("DWCC");
-        return rawUnitLevel == null ? null : rawUnitLevel + 1;
-    }
-
-    /**
-     * DWCC 为信息中心单位层次，排序时用于尽量先处理父级单位，便于后续子级找到父节点。
-     */
-    private int getUnitLevel(JSONObject raw) {
-        return raw.getInt("DWCC", 0);
-    }
 }

src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java

@@ -131,12 +131,18 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
         log.info("开始全量更新用户数据");
 
         // 获取角色信息
-        Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC);
+//        Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC);
 
         // 获取单位信息，后续判断单位变更
         List<Sys_unit> unitList = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1"));
         unitIdNameMap = unitList.stream().collect(Collectors.toMap(Sys_unit::getId, Sys_unit::getName));
 
+        // 民族来源值为代码，更新系统用户前按现有码表换成名称。
+        Map<String, String> nationNames = dao.query(Sys_data_dict.class, Cnd.where("parentCode", "=", "USER_NATION"))
+                .stream()
+                .filter(dict -> StrUtil.isAllNotBlank(dict.getCode(), dict.getName()))
+                .collect(Collectors.toMap(Sys_data_dict::getCode, Sys_data_dict::getName, (first, second) -> first));
+
         // 查询数据源
         Cnd cnd = Cnd.where(Sys_user_source::getPullTime, "=", updateParam.getPullTime());
 
@@ -159,8 +165,14 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
 
         // 处理每条数据
         for (Sys_user_source source : sources) {
+            normalizeSourceForUpdate(source, nationNames);
+            if (StrUtil.isBlank(source.getLoginname())) {
+                log.warn("数据源中存在空工号，跳过该记录");
+                continue;
+            }
             Sys_user user = userMap.get(source.getLoginname());
-            source.setMember(null);
+            // 会员及福利会员由会员业务维护；来源快照中的默认 0 不参与本次人员更新。
+            clearMembershipFields(source);
             String unitId = source.getUnitId();
             if (StringUtils.isNotBlank(unitId) && unitId.length() == 5) {
                 source.setUnitId(unitId.substring(0, 3));
@@ -180,11 +192,6 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
             } else {
                 // 修改现有用户
                 u.setId(user.getId());
-                /*
-                 * aidFundMember 由基金会员业务维护，数据中心源表默认值为 0。
-                 * 全量更新已有用户时置空，避免 updateIgnoreNull 把已迁移的基金会员标识覆盖为非会员。
-                 */
-                u.setAidFundMember(null);
                 u.setPersonType(null);
                 needDoUpdateList.add(u);
             }
@@ -220,6 +227,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
             updateTasks.add(insertTask);
 
             // 异步处理公共角色分配
+            /* 暂停人员更新时的角色变动；新用户仅写基本信息。
             if (!needInitUserList.isEmpty()) {
                 CompletableFuture<Void> roleTask = CompletableFuture.runAsync(() -> {
                     try {
@@ -248,6 +256,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
                 }, executorService);
                 // 不等待角色分配完成
             }
+            */
         }
 
         // 2. 更新现有用户 - 使用批量处理
@@ -352,10 +361,12 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
 
         // 6. 处理其他任务
         // 6.1 更新提案的校领导角色，发送订阅
+        /* 暂停人员更新触发的角色刷新。
         ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt"));
         for (String unitId : config.getSchoolLeaderUnitIds()) {
             RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
         }
+        */
 
         /*
          * 所有异步用户更新完成后再校正待确认状态，避免主事务提前锁定 sys_user，
@@ -373,6 +384,52 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
                + " 条";
     }
 
+    /**
+     * 更新前将来源记录的空白字符串转为 null，供 updateIgnoreNull 跳过，同时避免生成空白变更记录。
+     * 入参 source 为本次 sys_user_source 记录，nationNames 为 USER_NATION 的代码名称映射；
+     * 方法直接规范化 source，无返回值。未匹配到的非空民族代码保留原值。
+     */
+    private void normalizeSourceForUpdate(Sys_user_source source, Map<String, String> nationNames) {
+        for (Field field : cn.hutool.core.util.ReflectUtil.getFields(Sys_user_source.class)) {
+            if (field.getType() != String.class) {
+                continue;
+            }
+            try {
+                field.setAccessible(true);
+                String value = (String) field.get(source);
+                field.set(source, StrUtil.isBlank(value) ? null : StrUtil.trim(value));
+            } catch (IllegalAccessException e) {
+                throw new IllegalStateException("规范化人员来源字段失败: " + field.getName(), e);
+            }
+        }
+        if ("1".equals(source.getSex())) {
+            source.setSex("男");
+        } else if ("2".equals(source.getSex())) {
+            source.setSex("女");
+        }
+        if (StrUtil.isNotBlank(source.getNation())) {
+            source.setNation(nationNames.getOrDefault(source.getNation(), source.getNation()));
+        }
+    }
+
+    /**
+     * 将人员来源中的会员字段置空，避免快照默认值修改系统会员和福利会员状态。
+     * source 是当前内存中的 sys_user_source 记录；方法不更新来源表，无返回值。
+     */
+    private void clearMembershipFields(Sys_user_source source) {
+        source.setMember(null);
+        source.setMemberTime(null);
+        source.setWelfareMember(null);
+        source.setWantJoinLoveMutualAidAssociation(null);
+        source.setPreparationMemberFee(null);
+        source.setContractMemberFee(null);
+        source.setAidFundMember(null);
+        source.setAidFundMemberUserType(null);
+        source.setAidFundDeductTime(null);
+        source.setAidFundMemberJoinTime(null);
+        source.setAidFundMemberQuitTime(null);
+    }
+
     /**
      * 根据指定批次的完整数据源校正系统用户待确认状态。
      * 已人工确认且仍未重新出现的人员保持已确认状态，避免每次全量更新重复转为待确认。
@@ -489,7 +546,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
 //        }
 
         // 2. 单位变更
-        if (!ObjectUtil.equals(user.getUnitId(), source.getUnitId())) {
+        if (StrUtil.isNotBlank(source.getUnitId()) && !ObjectUtil.equals(user.getUnitId(), source.getUnitId())) {
             changeTypes.add(MemberChangeType.UNIT_CHANGE.name());
             NutMap change = NutMap.NEW();
             change.put("fieldName", "单位");
@@ -499,8 +556,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
             changeList.add(change);
 
             // 单位异动发送订阅消息，清空原单位的所有角色
-            UserChangePublisher.broadcast(new UserChangeMsg(List.of(user.getId()),
-                    UserChangeMsg.UNIT_CHANGE_OPERATION, user.getUnitId(), source.getUnitId()));
+            // 单位代码和历史仍更新，角色清理由会员及权限业务另行处理。
+//            UserChangePublisher.broadcast(new UserChangeMsg(List.of(user.getId()),
+//                    UserChangeMsg.UNIT_CHANGE_OPERATION, user.getUnitId(), source.getUnitId()));
         }
 
         // 如果没有任何变更，返回null

src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java

@@ -27,8 +27,11 @@ import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.random.R;
 
+import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 /**
  * 增量更新系统用户数据
@@ -58,6 +61,17 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
         // 执行查询
         List<Sys_user_source> userSources = dao.query(Sys_user_source.class, cnd);
 
+        // 新增人员也按系统显示值保存性别和民族，空白来源字段不写入新用户。
+        Map<String, String> nationNames = dao.query(Sys_data_dict.class, Cnd.where("parentCode", "=", "USER_NATION"))
+                .stream()
+                .filter(dict -> StrUtil.isAllNotBlank(dict.getCode(), dict.getName()))
+                .collect(Collectors.toMap(Sys_data_dict::getCode, Sys_data_dict::getName, (first, second) -> first));
+        userSources.forEach(source -> normalizeSourceForUpdate(source, nationNames));
+        userSources = userSources.stream().filter(source -> StrUtil.isNotBlank(source.getLoginname())).toList();
+
+        // 增量新增人员不从来源快照复制会员状态及福利会员状态。
+        userSources.forEach(this::clearMembershipFields);
+
         //加入到系统用户表
         List<Sys_user> sysUsers = BeanUtil.copyToList(userSources, Sys_user.class);
         for (Sys_user sysUser : sysUsers) {
@@ -88,9 +102,9 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
         List<CompletableFuture<List<Sys_user_history>>> splitHistoryFutures = splitHistories.stream().map(v -> CompletableFuture.supplyAsync(() -> dao.fastInsert(v))).toList();
         AsyncUtil.waitAll(CompletableFuture.allOf(splitHistoryFutures.toArray(new CompletableFuture[0])));
 
-        Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC);
+//        Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC);
 
-        //添加公共角色
+        /* 暂停人员更新时的角色分配。
         List<Sys_user_role> sysUserRoles = sysUsers.stream().map(user -> {
             Sys_user_role sysUserRole = new Sys_user_role();
             sysUserRole.setUserId(user.getId());
@@ -101,6 +115,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
             dao.insert(sysUserRoles);
         });
         sysRoleService.clearCache();
+        */
 
         //比较单位数据
         List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2));
@@ -130,14 +145,62 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
         });
 
         // 6.1 更新提案的校领导角色，发送订阅
+        /* 暂停人员更新触发的角色刷新。
         ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt"));
         for (String unitId : config.getSchoolLeaderUnitIds()) {
             RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
         }
+        */
 
         if (sysUsers.isEmpty() && insertUnits.isEmpty()) {
             return "本次没有新增人员或单位。";
         }
         return StrUtil.format("增量更新成功,本次新增人员{}人,新增单位{}个。", sysUsers.size(), insertUnits.size());
     }
+
+    /**
+     * 新增用户前规范化来源字段：空白字符串不入库，性别和民族代码转为现有系统名称。
+     * 入参 source 为 sys_user_source 记录，nationNames 为 USER_NATION 的代码名称映射；
+     * 方法直接修改内存中的 source，无返回值。未识别的非空编码保持原值。
+     */
+    private void normalizeSourceForUpdate(Sys_user_source source, Map<String, String> nationNames) {
+        for (Field field : cn.hutool.core.util.ReflectUtil.getFields(Sys_user_source.class)) {
+            if (field.getType() != String.class) {
+                continue;
+            }
+            try {
+                field.setAccessible(true);
+                String value = (String) field.get(source);
+                field.set(source, StrUtil.isBlank(value) ? null : StrUtil.trim(value));
+            } catch (IllegalAccessException e) {
+                throw new IllegalStateException("规范化人员来源字段失败: " + field.getName(), e);
+            }
+        }
+        if ("1".equals(source.getSex())) {
+            source.setSex("男");
+        } else if ("2".equals(source.getSex())) {
+            source.setSex("女");
+        }
+        if (StrUtil.isNotBlank(source.getNation())) {
+            source.setNation(nationNames.getOrDefault(source.getNation(), source.getNation()));
+        }
+    }
+
+    /**
+     * 新增系统用户前排除来源快照的会员字段；新账号会员状态按系统默认值初始化。
+     * source 是当前内存中的 sys_user_source 记录；不修改来源表，无返回值。
+     */
+    private void clearMembershipFields(Sys_user_source source) {
+        source.setMember(null);
+        source.setMemberTime(null);
+        source.setWelfareMember(null);
+        source.setWantJoinLoveMutualAidAssociation(null);
+        source.setPreparationMemberFee(null);
+        source.setContractMemberFee(null);
+        source.setAidFundMember(null);
+        source.setAidFundMemberUserType(null);
+        source.setAidFundDeductTime(null);
+        source.setAidFundMemberJoinTime(null);
+        source.setAidFundMemberQuitTime(null);
+    }
 }

src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java

@@ -115,96 +115,81 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
     @Aop(TransAop.READ_COMMITTED)
     public Date pull() {
         try {
-            // 获取数据中心的字典
-            List<Sys_data_dict> dataDictList = dao().query(Sys_data_dict.class, Cnd.NEW());
-            // 字典码表Map，key为父级编码，value为子级字典列表
-            Map<String, List<Sys_data_dict>> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode));
-
-            String accessToken = getDmpAccessToken();
-            List<JSONObject> rawDataList = new ArrayList<>();
-            rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_TEACHER_KEY), accessToken, "在岗教职工"));
-            rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_DISPATCH_KEY), accessToken, "在岗劳务派遣"));
-            rawDataList = distinctDmpUsers(rawDataList);
-
+            // 先确认本地中间表有人员，避免空表产生一个看似成功的拉取批次。
+            List<NutMap> rawDataList = listMap(Sqls.create("SELECT * FROM user_middle"));
             if (rawDataList.isEmpty()) {
-                log.warn("当前未获取到人员数据");
+                throw new BaseException("本地人员中间表没有数据，已停止拉取");
             }
 
+            // 单位必须先入库；人员快照的 DWDM 已是三位二级单位代码。
+            sysDataUnitPullService.updateUnits();
             Date nowDate = new Date();
-
-            // 赋值
-            List<Sys_user_source> latestSourceList = rawDataList.stream().map(raw -> {
-                Sys_user_source sysUser = new Sys_user_source();
-
-                // 使用缓存的字段映射
-                for (FieldMapping mapping : getFieldMappings()) {
-                    try {
-                        // 根据字段类型设置值
-                        if (mapping.field.getType() == String.class) {
-
-                            if (StrUtil.isNotBlank(mapping.dict)) {
-                                List<Sys_data_dict> sysDataDicts = dataDictMap.getOrDefault(mapping.dict, Collections.emptyList());
-                                Sys_data_dict sysDataDict = sysDataDicts.stream()
-                                        .filter(v -> raw.getStr(mapping.key, "").equals(v.getCode()))
-                                        .findFirst().orElse(new Sys_data_dict());
-                                mapping.field.set(sysUser, StrUtil.blankToDefault(sysDataDict.getName(), raw.getStr(mapping.key)));
-                            } else {
-                                // 特殊处理 根据身份证号获取性别和出生年月
-                                if ("SFZJH".equals(mapping.key)) {
-                                    String idCard = raw.getStr(mapping.key);
-                                    mapping.field.set(sysUser, idCard);
-                                    // 设置出生年月
-                                    try {
-                                        sysUser.setBirthday(IdcardUtil.getBirthDate(idCard));
-                                    } catch (Exception e) {
-                                        sysUser.setBirthday(null);
-                                    }
-                                } else if ("LXNY".equals(mapping.key)) {
-                                    mapping.field.set(sysUser, normalizeArrivalAtSchoolDate(raw.getStr(mapping.key)));
-                                } else {
-                                    mapping.field.set(sysUser, raw.getStr(mapping.key));
-                                }
-                            }
-                        } else if (mapping.field.getType() == Date.class) {
-                            mapping.field.set(sysUser, raw.getDate(mapping.key));
-                        }
-                    } catch (IllegalAccessException e) {
-                        log.error("设置字段值失败: {}", mapping.field.getName(), e);
-                    }
+            Map<String, Sys_user_source> sourceMap = new LinkedHashMap<>();
+            for (NutMap raw : rawDataList) {
+                String loginname = StrUtil.trim(raw.getString("ZGH"));
+                if (StrUtil.isBlank(loginname)) {
+                    throw new BaseException("人员中间表存在空工号，已停止拉取");
                 }
-
-                sysUser.setUnitName(raw.getStr("SZDW"));
-                sysUser.setUnitId(resolveSourceUnitId(raw.getStr("SZDWH")));
-
-                // 设置拉取时间
-                sysUser.setPullTime(nowDate);
-
-                return sysUser;
-            }).toList();
-
-            log.info("用户数据初始化完成，等待插入，当前数据条数{}", latestSourceList.size());
-            // 插入到数据库
-            if (CollUtil.isNotEmpty(latestSourceList)) {
-                dao().insert(latestSourceList);
-            }
-
-            // 人员的单位数据和数据库的单位数据比较，如果人员里面有单位不存在，去更新单位数据
-            List<String> sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).filter(StrUtil::isNotBlank).distinct().toList();
-            Sql sql = Sqls.create("select id from sys_unit group by id");
-            sql.setCallback(Sqls.callback.strList());
-            dao().execute(sql);
-            List<String> unitIds = sql.getList(String.class);
-
-            if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) {
-                log.info("单位需要更新，正在同步更新");
-                sysDataUnitPullService.updateUnits(unitIds);
+                sourceMap.putIfAbsent(loginname, mapMiddleUser(raw, nowDate));
             }
+            dao().insert(new ArrayList<>(sourceMap.values()));
+            log.info("本地人员中间表拉取完成，原始记录数: {}，去重后记录数: {}", rawDataList.size(), sourceMap.size());
             return nowDate;
         } catch (Exception e) {
             throw new BaseException("数据拉取失败,{}", e.getMessage());
         }
     }
 
+    /**
+     * 将 user_middle 的一条人员记录映射为本次拉取快照。
+     * raw 包含工号 ZGH、姓名 XM、单位 DWDM/DWMC 等本地中间表字段；pullTime 是本次批次时间。
+     * 返回 Sys_user_source，仅用于写入数据源表，不修改 sys_user。
+     */
+    private Sys_user_source mapMiddleUser(NutMap raw, Date pullTime) {
+        Sys_user_source source = new Sys_user_source();
+        source.setLoginname(StrUtil.trim(raw.getString("ZGH")));
+        source.setUsername(middleValue(raw, "XM"));
+        source.setUnitId(middleValue(raw, "DWDM"));
+        source.setUnitName(middleValue(raw, "DWMC"));
+        source.setSex(middleValue(raw, "XB"));
+        source.setNation(middleValue(raw, "MZ"));
+        source.setUserState(middleValue(raw, "DQZT"));
+        source.setPersonType(middleValue(raw, "JZGRYLB"));
+        source.setEducation(middleValue(raw, "XL"));
+        source.setMobile(middleValue(raw, "SJH"));
+        source.setAcademicDegree(middleValue(raw, "XW"));
+        source.setProfessionalTitle(middleValue(raw, "ZYJSZW"));
+        source.setProfessionalLevel(middleValue(raw, "ZYJSGWDJ"));
+        source.setPolitical(middleValue(raw, "ZZMM"));
+        source.setIdCard(middleValue(raw, "SFZJH"));
+        source.setBirthday(parseMiddleBirthDate(raw.getString("CSRQ")));
+        source.setPullTime(pullTime);
+        return source;
+    }
+
+    /**
+     * 将中间表的空字符串转为 null，避免后续正式更新时用空值覆盖系统用户字段。
+     */
+    private String middleValue(NutMap raw, String column) {
+        String value = StrUtil.trim(raw.getString(column));
+        return StrUtil.isBlank(value) ? null : value;
+    }
+
+    /**
+     * CSRQ 当前以 yyyy/MM/dd 开头，后面可能包含时间；只取日期部分。
+     * 空值返回 null，异常格式抛错以阻止生成不完整的拉取批次。
+     */
+    private Date parseMiddleBirthDate(String birthDate) {
+        if (StrUtil.isBlank(birthDate)) {
+            return null;
+        }
+        String dateText = birthDate.length() >= 10 ? birthDate.substring(0, 10).replace('/', '-') : "";
+        if (!dateText.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            throw new BaseException("人员中间表存在异常出生日期，已停止拉取");
+        }
+        return DateUtil.parseDate(dateText);
+    }
+
     /**
      * 规范化信息中心返回的来校时间。
      * 入参 arrivalAtSchoolDate 对应信息中心 LXNY 字段，允许 yyyy-MM-dd 或 yyyy-MM；

src/main/java/com/budwk/app/sys/services/impl/SysHomeNewsServiceImpl.java

@@ -1,6 +1,5 @@
 package com.budwk.app.sys.services.impl;
 
-import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.sys.services.SysHomeNewsService;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -35,7 +34,7 @@ public class SysHomeNewsServiceImpl implements SysHomeNewsService {
     /**
      * 无需参数，一次抓取首页中的三个栏目，并保留原有一天有效期的缓存写入。
      *
-     * @return label/value 栏目列表，文章包含 text/time/href；正常空栏目返回空列表。
+     * @return label/value 栏目列表，文章包含 text/time/href；无文章的栏目保留空列表，抓取失败返回空栏目列表。
      */
     @Override
     @Aop(TransAop.READ_COMMITTED)
@@ -51,7 +50,8 @@ public class SysHomeNewsServiceImpl implements SysHomeNewsService {
             return news;
         } catch (IOException e) {
             log.warn("获取重庆工贸职业技术学院工会首页失败", e);
-            throw new BaseException("学校工会网站暂时无法访问，请稍后重试");
+            // 学校网站连接失败或超时时返回空列表，让首页展示空状态，不向用户报错，也不覆盖已有缓存。
+            return new ArrayList<>();
         }
     }
 

src/main/java/com/budwk/app/sys/services/impl/SysMsgServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.http.HtmlUtil;
 import com.budwk.app.base.constant.RedisConstant;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.sms.SmsService;
+import com.budwk.app.base.wxwork.WxWorkMessageService;
 import com.budwk.app.base.sms.model.MsgPlatformWechatRequest;
 import com.budwk.app.base.utils.ManyAddOrRenewUtil;
 import com.budwk.app.sys.models.Sys_msg;
@@ -62,6 +63,8 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
     private ManyAddOrRenewUtil manyAddOrRenewUtil;
     @Inject
     private SmsService smsService;
+    @Inject
+    private WxWorkMessageService wxWorkMessageService;
 
     private static NutMap typeMap = NutMap.NEW().addv("system", "系统消息").addv("user", "用户消息");
 
@@ -102,14 +105,29 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
             }
         });
 
-        //发送学校平台消息
-        ThreadUtil.execute(() -> {
-            for (String loginName : loginNames) {
-                smsService.sendSmsByAccount(loginName,sysMsg.getNote());
-                smsService.sendWechatTextByAccountOrMobile(loginName,sysMsg.getNote());
-            }
-
-        });
+        // isExternal=false 为仅站内通知；外部通道分别处理异常，避免短信失败阻断企业微信。
+        if (isExternal) {
+            ThreadUtil.execute(() -> {
+                for (String loginName : loginNames) {
+                    try {
+                        smsService.sendSmsByAccount(loginName, sysMsg.getNote());
+                    } catch (Exception e) {
+                        log.error("消息短信发送失败，msgId=" + sysMsg.getId(), e);
+                    }
+                }
+            });
+            ThreadUtil.execute(() -> {
+                try {
+                    // 学校企业微信 userid 直接使用 loginname；批量发送标题、正文及业务链接。
+                    NutMap result = wxWorkMessageService.massSend(loginNames, sysMsg.getTitle(), sysMsg.getNote(), sysMsg.getUrl());
+                    if (!result.getBoolean("skipped", false) && !result.getBoolean("success", false)) {
+                        log.warn("企业微信消息存在失败接收人，msgId=" + sysMsg.getId() + "，result=" + result);
+                    }
+                } catch (Exception e) {
+                    log.error("企业微信消息发送失败，msgId=" + sysMsg.getId(), e);
+                }
+            });
+        }
 
         return sysMsg;
     }
@@ -292,11 +310,13 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void sendMsg(String loginname, String title, String body, String sender) {
         sendMsg(List.of(loginname), title, body, SecurityUtil.getUserId());
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void sendMsg(List<String> loginNames, String title, String body, String sender) {
         Sys_msg sysMsg = new Sys_msg();
         sysMsg.setTitle(title);
@@ -309,6 +329,7 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void sendMsgInSys(List<String> loginNames, String title, String body, String sender) {
         Sys_msg sysMsg = new Sys_msg();
         sysMsg.setTitle(title);

src/main/java/com/budwk/app/sys/services/impl/SysRoleServiceImpl.java

@@ -20,6 +20,7 @@ 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.lang.util.NutMap;
 import org.nutz.plugins.wkcache.annotation.CacheDefaults;
 import org.nutz.plugins.wkcache.annotation.CacheRemoveAll;
 import org.nutz.plugins.wkcache.annotation.CacheResult;
@@ -284,4 +285,44 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Sys_role> implements Sys
     public void clearCache() {
 
     }
+
+    /**
+     * 批量补齐会员角色。仅处理 member=1 的用户，保留其他角色及账号禁用状态。
+     *
+     * @return addedCount 为新增关联数，enabledCount 为恢复启用的关联数
+     */
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public NutMap settingMemberRole() {
+        // 锁定同一会员角色，使本接口的并发请求依次执行，避免重复插入用户角色关系。
+        Sql roleSql = Sqls.create("SELECT * FROM sys_role WHERE code=@code FOR UPDATE");
+        roleSql.setParam("code", RoleConstant.MEMBER.name());
+        roleSql.setEntity(dao().getEntity(Sys_role.class));
+        roleSql.setCallback(Sqls.callback.entities());
+        dao().execute(roleSql);
+        List<Sys_role> roles = roleSql.getList(Sys_role.class);
+        if (roles.isEmpty()) {
+            throw new BaseException("会员角色（MEMBER）不存在，请先配置会员角色");
+        }
+        Sys_role role = roles.get(0);
+        if (role.isDisabled()) {
+            throw new BaseException("会员角色（MEMBER）已禁用，请先启用会员角色");
+        }
+
+        // 历史关联可能已停用或未填写 enable；恢复关联即可，无需重新插入。
+        Sql enableSql = Sqls.create("UPDATE sys_user_role SET enable=1 WHERE roleId=@roleId "
+                + "AND (enable IS NULL OR enable<>1) "
+                + "AND EXISTS (SELECT 1 FROM sys_user u WHERE u.id=sys_user_role.userId AND u.member=1)");
+        enableSql.setParam("roleId", role.getId());
+        dao().execute(enableSql);
+
+        // 按用户、角色判重，只为缺少会员关联的人员添加记录；不删除任何已有角色。
+        Sql insertSql = Sqls.create("INSERT INTO sys_user_role (userId,roleId,enable) "
+                + "SELECT u.id,@roleId,1 FROM sys_user u WHERE u.member=1 "
+                + "AND NOT EXISTS (SELECT 1 FROM sys_user_role ur WHERE ur.userId=u.id AND ur.roleId=@roleId)");
+        insertSql.setParam("roleId", role.getId());
+        dao().execute(insertSql);
+        return NutMap.NEW().addv("addedCount", insertSql.getUpdateCount())
+                .addv("enabledCount", enableSql.getUpdateCount());
+    }
 }

src/main/java/com/budwk/app/web/commons/proc/WkFailProcessor.java

@@ -189,25 +189,16 @@ public class WkFailProcessor extends ViewProcessor {
         if (Globals.sso) {
             //1.判断是否为企业微信浏览器并且对接了企业微信
             if (browserPlatform == BrowserPlatform.QI_YE_WEI_XIN && propertiesProxy.getBoolean("wxwork.enable", false)) {
-                //进行企业微信授权
-//                String token = getWxWorkToken();
-//                if (StrUtil.isNotBlank(token)) {
-//                    //跳转到企业微信授权地址
-//                    new ServerRedirectView(buildWxWorkOauth2Url()).render(request, response, null);
-//                } else {
-//                    //跳转到错误页 别问我为啥错了 我也不知道 首先去检查配置文件里的参数有没有写对
-////                    new ServerRedirectView(Globals.AppDomain + errorUri).render(request, response, null);
-//                    //跳转到cas登录页
-//                    String callBackUrl = propertiesProxy.get("cas.client-host-url") + propertiesProxy.get("cas.client-call-back-url") + "?redirect=" + redirect;
-//                    String authUrl = propertiesProxy.get("cas.qi-wx-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
-//                    new ServerRedirectView(authUrl).render(request, response, null);
-//                }
-
-                // 武汉城市职业学院 跳转到企业微信cas登录页
-                String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect;
-                String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
-                log.info("auth:"+authUrl);
-                new ServerRedirectView(authUrl).render(request, response, null);
+                // 专用企业微信认证配置缺失时整组回退到已接通的 CAS，保留卡片原始页面。
+                try {
+                    String authUrl = buildEnterpriseCasUrl(redirect);
+                    log.info("auth:" + authUrl);
+                    new ServerRedirectView(authUrl).render(request, response, null);
+                } catch (IllegalArgumentException e) {
+                    log.error("企业微信登录跳转配置无效：" + e.getMessage());
+                    response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                            "统一身份认证配置不完整或无效，请联系管理员检查认证地址及回调地址");
+                }
             } else if (browserPlatform == BrowserPlatform.WEI_XIN && propertiesProxy.getBoolean("wx.enable", false)) {
                 //进行微信公众号授权
                 //跳转到微信授权页
@@ -225,6 +216,53 @@ public class WkFailProcessor extends ViewProcessor {
         }
     }
 
+    /**
+     * 构造企业微信内的 CAS 登录地址。redirect 为已 URL 编码的原始站内路径及查询参数；
+     * 返回携带 service 参数的完整认证 URL，认证回调通过 redirect 返回卡片页面。
+     * 三个 wecom 配置必须同时存在，否则整体使用 cas 配置，避免混用两套认证平台。
+     */
+    private String buildEnterpriseCasUrl(String redirect) {
+        String loginUrl = propertiesProxy.get("wecom.wecom-server-login-url");
+        String clientHost = propertiesProxy.get("wecom.wecom-client-host-url");
+        String callbackPath = propertiesProxy.get("wecom.wecom-client-call-back-url");
+        if (missingAuthConfig(loginUrl) || missingAuthConfig(clientHost) || missingAuthConfig(callbackPath)) {
+            loginUrl = propertiesProxy.get("cas.server-login-url");
+            clientHost = propertiesProxy.get("cas.client-host-url");
+            callbackPath = propertiesProxy.get("cas.client-call-back-url");
+        }
+        if (missingAuthConfig(loginUrl) || missingAuthConfig(clientHost) || missingAuthConfig(callbackPath)) {
+            throw new IllegalArgumentException("CAS 登录地址、系统域名或回调路径为空");
+        }
+        loginUrl = loginUrl.trim();
+        clientHost = clientHost.trim();
+        callbackPath = callbackPath.trim();
+        validateAuthUrl(loginUrl);
+        validateAuthUrl(clientHost);
+        // 回调必须是本系统路径，不能被绝对 URL 或双斜线路径覆盖到其他主机。
+        if (!callbackPath.startsWith("/") || callbackPath.startsWith("//") || callbackPath.contains("#")) {
+            throw new IllegalArgumentException("认证回调必须是以单斜线开头的站内路径");
+        }
+        String callback = clientHost.replaceAll("/+$", "") + callbackPath
+                + (callbackPath.contains("?") ? "&" : "?") + "redirect=" + redirect;
+        // 保留部署配置中的 HTTP/HTTPS 协议；工会 HTTPS 回调不会被改为 HTTP。
+        return loginUrl + (loginUrl.contains("?") ? "&" : "?") + "service="
+                + URLEncoder.encode(callback, StandardCharsets.UTF_8);
+    }
+
+    /** 空值和字面量 null 都视为未配置，防止拼接出浏览器相对地址 null?service=...。 */
+    private boolean missingAuthConfig(String value) {
+        return StrUtil.isBlank(value) || "null".equalsIgnoreCase(value.trim());
+    }
+
+    /** 认证地址和回调域名必须为完整 HTTP(S) URL，拒绝无主机名、片段或用户信息的地址。 */
+    private void validateAuthUrl(String value) {
+        java.net.URI uri = java.net.URI.create(value);
+        if (!("https".equalsIgnoreCase(uri.getScheme()) || "http".equalsIgnoreCase(uri.getScheme()))
+                || uri.getHost() == null || uri.getFragment() != null || uri.getUserInfo() != null) {
+            throw new IllegalArgumentException("认证配置不是有效的 HTTP(S) 地址");
+        }
+    }
+
     /**
      * 判断浏览器平台
      *

src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java

@@ -4,12 +4,14 @@ package com.budwk.app.zhgh.activity.sports.service.impl;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.DateUtil;
 import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.sys.models.Sys_home_template;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.activity.basic.models.ActivityEvent;
 import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
 import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnion;
 import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
@@ -28,6 +30,7 @@ import org.nutz.dao.entity.Record;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 
@@ -55,6 +58,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
     @Override
     @Aop(TransAop.READ_COMMITTED)
     public String doAdd(ActivitySchool activitySchool, ActivitySchoolEvent[] events) {
+        events = validateAndApplySingleEventLimits(events);
         ActivityBasicUnit activityBasicUnit = dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 
         if (activitySchool.getActivityLevel() == 40002) {
@@ -101,6 +105,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
     @Override
     @Aop(TransAop.READ_COMMITTED)
     public void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events) {
+        events = validateAndApplySingleEventLimits(events);
         ActivitySchool school = dao().fetch(ActivitySchool.class, activitySchool.getId());
         if (school.getActivityLevel() == 40002) {
             school.setBelongUnionId(SecurityUtil.getUnionId());
@@ -161,6 +166,56 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
         dao().insertOrUpdate(sysHomeActivity);
     }
 
+    /**
+     * 校验单项人数限制，并在具体单项未设置限制时应用“所有单项”的默认值。
+     *
+     * @param events 页面提交的项目配置，允许包含 eventId 为 allItems 的默认配置
+     * @return 已移除 allItems 临时配置、可直接持久化的项目配置数组
+     */
+    private ActivitySchoolEvent[] validateAndApplySingleEventLimits(ActivitySchoolEvent[] events) {
+        if (events == null || events.length == 0) {
+            return new ActivitySchoolEvent[0];
+        }
+
+        ActivitySchoolEvent allItems = Arrays.stream(events)
+                .filter(event -> event != null && "allItems".equals(event.getEventId()))
+                .findFirst()
+                .orElse(null);
+        List<ActivitySchoolEvent> result = new ArrayList<>();
+        for (ActivitySchoolEvent event : events) {
+            if (event == null || "allItems".equals(event.getEventId())) {
+                continue;
+            }
+            ActivityEvent activityEvent = dao().fetch(ActivityEvent.class, event.getEventId());
+            if (activityEvent != null && "1".equals(activityEvent.getProjectType())) {
+                applySingleEventDefaultLimit(event, allItems);
+            }
+            result.add(event);
+        }
+        return result.toArray(new ActivitySchoolEvent[0]);
+    }
+
+    /**
+     * 单项的两个限制必须同时设置；均未设置或均为0时继承“所有单项”的对应值。
+     */
+    private void applySingleEventDefaultLimit(ActivitySchoolEvent event, ActivitySchoolEvent allItems) {
+        Integer athletesMaxNum = event.getAthletesMaxNum();
+        Integer restrictRegNumber = event.getRestrictRegNumber();
+        if ((athletesMaxNum == null) != (restrictRegNumber == null)) {
+            throw new BaseException("每队（项）运动员最多人数和每人限报项目必须同时设置");
+        }
+
+        boolean useDefault = athletesMaxNum == null || (athletesMaxNum == 0 && restrictRegNumber == 0);
+        if (!useDefault) {
+            return;
+        }
+        if (allItems == null || allItems.getAthletesMaxNum() == null || allItems.getRestrictRegNumber() == null) {
+            throw new BaseException("请先设置所有单项的运动员最多人数和每人限报项目");
+        }
+        event.setAthletesMaxNum(allItems.getAthletesMaxNum());
+        event.setRestrictRegNumber(allItems.getRestrictRegNumber());
+    }
+
     @Aop(TransAop.READ_COMMITTED)
     private void addTeam(String schoolId, ActivitySchoolEvent[] events) {
         if (events.length > 0) {
@@ -271,33 +326,19 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
                     WHERE
                     	app.activityId = @id
                     	and app.status = 2
-                    	$cnd
+                        and (@filterUnion = 0 or app.activityUnionId = @unionId)
                     ORDER BY
                         ev.allName DESC,
                     	u.unionname DESC,
                      	app.`team` asc
-                    """).setParam("id", id)
-                    .setVar("cnd", "");
-            if (Strings.isNotBlank(unionId)) {
-                sql.setVar("cnd", "and u.unionid = @unionId");
-                sql.setParam("unionId", unionId);
-            }
+                    """).setParam("id", id);
+            // 参数必须声明在原始SQL中；setVar追加的字符串不会再次解析其中的@参数。
+            // 未选择分工会时导出整个活动，选择时按报名记录中的活动分工会过滤。
+            sql.setParam("filterUnion", Strings.isNotBlank(unionId) ? 1 : 0);
+            sql.setParam("unionId", Strings.isNotBlank(unionId) ? unionId : "");
             List<Record> list = list(sql);
-            String activityName;
-            if (Lang.isNotEmpty(list)) {
-                activityName = list.get(0).getString("activityName");
-            } else {
-                activityName = "暂无人员";
-            }
-
             List<ActivitySchoolApply> excels = new ArrayList<>();
-
-            list.forEach(z -> {
-                ActivitySchoolApply schoolApply = z.toPojo(ActivitySchoolApply.class);
-                String s = schoolApply.getIdentity().stream().map(personType::getName).toList().toString();
-                schoolApply.setSf(s);
-                excels.add(schoolApply);
-            });
+            list.forEach(record -> excels.add(toActivitySchoolApplyExport(record)));
 
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.XSSF);
@@ -305,10 +346,42 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
             CommonDownloadUtil.download(getUnionApplyExportFileName(unionId), workbook, response);
         } catch (Exception e) {
             e.printStackTrace();
+            throw new BaseException("导出报名信息失败：" + e.getMessage());
         }
 
     }
 
+    /**
+     * 将原生SQL查询结果转换为报名信息导出对象。
+     * identity 是数据库JSON文本，需要显式转换为身份编码集合，避免 Record.toPojo 自动转换失败导致整表无数据。
+     *
+     * @param record 导出SQL返回的一行报名数据
+     * @return EasyPoi 使用的 ActivitySchoolApply 导出对象
+     */
+    private ActivitySchoolApply toActivitySchoolApplyExport(Record record) {
+        ActivitySchoolApply schoolApply = new ActivitySchoolApply();
+        schoolApply.setUnionname(record.getString("unionname"));
+        schoolApply.setTeam(record.getString("team"));
+        schoolApply.setAllName(record.getString("allName"));
+        schoolApply.setLoginname(record.getString("loginname"));
+        schoolApply.setUsername(record.getString("username"));
+        schoolApply.setMobile(record.getString("mobile"));
+        schoolApply.setIdCard(record.getString("idCard"));
+        schoolApply.setProfessionalLevel(record.getString("professionalLevel"));
+        schoolApply.setSex(record.getString("sex"));
+
+        String identityJson = record.getString("identity");
+        List<String> identities = Strings.isBlank(identityJson)
+                ? new ArrayList<>()
+                : Json.fromJsonAsList(String.class, identityJson);
+        String identityName = identities.stream()
+                .map(personType::getName)
+                .filter(Strings::isNotBlank)
+                .collect(Collectors.joining("、"));
+        schoolApply.setSf(identityName);
+        return schoolApply;
+    }
+
     private String getUnionApplyExportFileName(String unionId) {
         String unionName = "分工会";
         if (Strings.isNotBlank(unionId)) {

src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java

@@ -17,7 +17,6 @@ import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 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.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegister;
 import com.budwk.app.zhgh.club.service.SysClubExamineService;
@@ -119,10 +118,7 @@ public class ClubExamineApplyController {
 		if(StrUtil.isBlank(clubId)) {
 			return Result.error("社团信息为空，请核查");
 		}
-		int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId));
-		SysClub club = dao.fetch(SysClub.class, clubId);
-		int money = count * (club.getDue() != null ? Integer.parseInt(club.getDue()) : 0);
-		return Result.success(money);
+		return Result.success(sysClubExamineService.getClubMemberMoney(clubId));
 	}
 
 	@At
@@ -175,6 +171,10 @@ public class ClubExamineApplyController {
 	public Result save(@Param("data") SysClubExamineRegister examineRegister,
 					   @Param("incomeDetailed") String incomeDetailed,
 					   @Param("incomeCensus") String incomeCensus) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
 		} else {
@@ -190,6 +190,10 @@ public class ClubExamineApplyController {
 	public Result submit(@Param("data") SysClubExamineRegister examineRegister,
 						 @Param("incomeDetailed") String incomeDetailed,
 						 @Param("incomeCensus") String incomeCensus) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		SysClubExamineRegister reg;
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			reg = sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
@@ -221,6 +225,10 @@ public class ClubExamineApplyController {
 							  @Param("incomeDetailed") String incomeDetailed,
 							  @Param("incomeCensus") String incomeCensus,
 							  @Param("taskId") Long taskId) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
 		} else {

src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java

@@ -86,7 +86,7 @@ public class ClubExamineMineController {
         //nutMap.setv("schoolName", Globals.MyConfig.getString("AppName"));
         nutMap.setv("clubName", register.getClubName());
         nutMap.setv("create_time", register.getFoundTime());
-        nutMap.setv("dues_standard", register.getDue());
+        nutMap.setv("dues_standard", register.getDue() == null ? "--" : register.getDue() + "元/年");
         // 生成材料中的年度与列表展示的登记年度保持一致。
         nutMap.setv("year", register.getYear());
         nutMap.setv("registerDate", register.getRegisterDate());

src/main/java/com/budwk/app/zhgh/club/model/SysClub.java

@@ -91,8 +91,8 @@ public class SysClub extends BaseModel {
 
     @Column
     @Comment("会费标准")
-    @ColDefine(type = ColType.VARCHAR, width = 50)
-    private String due;
+    @ColDefine(type = ColType.DOUBLE, width = 10, precision = 2)
+    private Double due;
 
     @Column
     @Comment("附件")

src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java

@@ -57,8 +57,8 @@ public class SysClubExamineRegister extends BaseModel {
 
     @Column
     @Comment("会费标准")
-    @ColDefine(type = ColType.VARCHAR, width = 32)
-    private String due;
+    @ColDefine(type = ColType.DOUBLE, width = 10, precision = 2)
+    private Double due;
 
     @Column
     @Comment("年度活动情况")

src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java

@@ -24,6 +24,21 @@ public interface SysClubExamineService extends BaseService<SysClubExamineRegiste
 
     List<NutMap> getJgUser(@Valid String clubId);
 
+    /**
+     * 计算指定社团的年度会费收入。
+     *
+     * @param clubId 社团ID，用于查询当前会员数量和社团会费标准
+     * @return 会员数量乘以会费标准后的金额；社团或会费标准为空时返回0
+     */
+    Double getClubMemberMoney(@Valid String clubId);
+
+    /**
+     * 校验考核登记的两组活动明细。
+     * @param examineRegister 页面data参数对应的登记实体，yearActivityList为本年度活动，plans为下一年度计划
+     * @return String类型；通过返回null，否则返回缺失的明细行号及字段提示
+     */
+    String validateActivityRequired(SysClubExamineRegister examineRegister);
+
     SysClubExamineRegister doAdd(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus);
 
     SysClubExamineRegister doEdit(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus);

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java

@@ -13,6 +13,7 @@ import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 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.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegister;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegisterDetailed;
@@ -50,6 +51,15 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
 		super(dao);
 	}
 
+	@Override
+	public Double getClubMemberMoney(String clubId) {
+		int memberCount = dao().count(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", clubId));
+		SysClub club = dao().fetch(SysClub.class, clubId);
+		// 社团或会费标准为空时按0计算，保证考核登记初始化能够正常完成。
+		Double due = club == null || club.getDue() == null ? 0D : club.getDue();
+		return memberCount * due;
+	}
+
 	@Override
 	public List<NutMap> getClubUserNum(String clubId, Integer year) {
 		Date yearStart = DateUtil.parse(year + "-01-01 00:00:00");
@@ -345,6 +355,40 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
 		return listMap;
 	}
 
+	/**
+	 * 两组明细均至少填写一条；本年度主办单位和获奖情况保持选填。
+	 * @param examineRegister data参数绑定的登记实体，包含yearActivityList和plans两组JSON明细
+	 * @return 校验通过返回null，否则返回首个缺失字段的行号和名称
+	 */
+	@Override
+	public String validateActivityRequired(SysClubExamineRegister examineRegister) {
+		if (examineRegister == null) {
+			return "考核登记信息不能为空";
+		}
+		String message = validateActivityRows(examineRegister.getYearActivityList(), "本年度活动开展情况",
+				new String[]{"activityTime", "activityName", "activityAddress", "joinNum"},
+				new String[]{"活动时间", "活动主题/赛事名称", "活动地点", "参加人数"});
+		return message != null ? message : validateActivityRows(examineRegister.getPlans(), "下一年度活动计划",
+				new String[]{"activityName", "activityUnit", "activityAddress"},
+				new String[]{"活动主题/赛事名称", "活动/赛事主办单位", "活动地点"});
+	}
+
+	/** 检查空列表、空行及纯空白字段；数值0按已填写处理，不扩大为人数范围校验。 */
+	private String validateActivityRows(List<JSONObject> rows, String label, String[] fields, String[] names) {
+		if (rows == null || rows.isEmpty()) {
+			return label + "至少填写一条";
+		}
+		for (int i = 0; i < rows.size(); i++) {
+			JSONObject row = rows.get(i);
+			for (int j = 0; j < fields.length; j++) {
+				if (row == null || StrUtil.isBlank(row.getStr(fields[j]))) {
+					return label + "第" + (i + 1) + "条：" + names[j] + "不能为空";
+				}
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public SysClubExamineRegister doAdd(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus) {
 		// JSON转换为实体列表（空值判断避免转换异常）

src/main/java/com/budwk/app/zhgh/dayofficework/message/service/GlobalMessageSendService.java

@@ -193,7 +193,8 @@ public class GlobalMessageSendService {
                                 try {
                                     strategy.send(request.getTitle(), request.getContent(), request.getType(),
                                             request.getReceiverIds(), request.getConfig());
-                                    log.info("异步发送消息成功，渠道：{}", strategy.getChannel().getValue());
+                                    // 策略可能因开关关闭而跳过，实际发送结果由策略日志记录。
+                                    log.info("异步消息策略执行完成，渠道：{}", strategy.getChannel().getValue());
                                 } catch (Exception e) {
                                     log.error("异步发送消息失败，渠道：{}，错误：{}", strategy.getChannel().getValue(), e.getMessage(), e);
                                 }

src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatMessageSendStrategy.java

@@ -1,16 +1,23 @@
 package com.budwk.app.zhgh.dayofficework.message.strategy.impl;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.sms.SmsService;
+import com.budwk.app.base.wxwork.WxWorkMessageService;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.zhgh.dayofficework.message.enums.GlobalMessageChannel;
 import com.budwk.app.zhgh.dayofficework.message.strategy.GlobalMessageSendStrategy;
 import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 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.lang.util.NutMap;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 /**
@@ -24,6 +31,8 @@ public class WechatMessageSendStrategy implements GlobalMessageSendStrategy {
     private Dao dao;
     @Inject
     private SmsService smsService;
+    @Inject
+    private WxWorkMessageService wxWorkMessageService;
 
     @Override
     public GlobalMessageChannel getChannel() {
@@ -36,7 +45,13 @@ public class WechatMessageSendStrategy implements GlobalMessageSendStrategy {
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void send(String title, String content, Integer type, List<String> receiverIds, JSONObject config) {
+        // WF 的接收账号已在任务事务内取得，异步线程不再反查尚未提交的任务数据。
+        if (config != null && config.getLong("wfTaskId") != null) {
+            sendFlowCard(title, content, config);
+            return;
+        }
         try {
             log.info("开始发送微信消息，标题：{}，接收人数量：{}", title, receiverIds.size());
 
@@ -52,7 +67,12 @@ public class WechatMessageSendStrategy implements GlobalMessageSendStrategy {
     }
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void sendByLoginName(String title, String content, Integer type, List<String> receiverLoginNames, JSONObject config) {
+        if (config != null && config.getLong("wfTaskId") != null) {
+            sendFlowCard(title, content, config);
+            return;
+        }
         try {
             log.info("开始发送微信消息（按登录名），标题：{}，接收人数量：{}", title, receiverLoginNames.size());
 
@@ -67,6 +87,58 @@ public class WechatMessageSendStrategy implements GlobalMessageSendStrategy {
         }
     }
 
+    /**
+     * WF 专用分支：wfTaskId 为任务ID，wfLoginNames 为实际办理人的 loginname 列表，
+     * wxWorkLink 为非空手机入口。无返回值；关闭开关或无账号时跳过，失败抛给全局异步日志处理，
+     * 不回退旧微信通道，避免双发。非流程消息继续沿用原有通讯平台。
+     */
+    private void sendFlowCard(String title, String content, JSONObject config) {
+        Long taskId = config.getLong("wfTaskId");
+        List<String> loginNames = config.getJSONArray("wfLoginNames") == null ? List.of()
+                : config.getJSONArray("wfLoginNames").toList(String.class);
+        if (loginNames.isEmpty()) {
+            log.warn("WF 企业微信卡片跳过：办理人 loginname 为空，taskId={}", taskId);
+            return;
+        }
+        String link = StrUtil.blankToDefault(config.getStr("wxWorkLink"), "/platform/home");
+        NutMap result;
+        try {
+            result = wxWorkMessageService.massSend(loginNames, cardText(title, 128, false),
+                    cardText(content, 512, true), link);
+        } catch (RuntimeException e) {
+            // 异步线程已脱离任务调用栈，保留任务 ID 便于从错误日志定位具体待办。
+            throw new IllegalStateException("WF 企业微信卡片接口异常，taskId=" + taskId, e);
+        }
+        if (result != null && result.getBoolean("skipped", false)) {
+            log.info("WF 企业微信卡片跳过：消息开关关闭，taskId={}", taskId);
+        } else if (result != null && result.getBoolean("success", false)) {
+            log.info("WF 企业微信卡片发送成功，taskId={}，接收账号数={}", taskId, loginNames.size());
+        } else {
+            log.error("WF 企业微信卡片发送失败或部分失败，taskId={}，result={}", taskId, result);
+            throw new IllegalStateException("WF 企业微信卡片发送失败或部分失败，taskId=" + taskId);
+        }
+    }
+
+    /** 卡片有 UTF-8 字节上限；按 Unicode 码点缩短摘要，并计入正文 HTML 转义后的长度。 */
+    private String cardText(String value, int limit, boolean description) {
+        String text = HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(value, "流程待办")))
+                .replace('\r', ' ').replace('\n', ' ');
+        if (text.isBlank()) text = "流程待办";
+        StringBuilder result = new StringBuilder();
+        int bytes = 0;
+        for (int offset = 0; offset < text.length();) {
+            int codePoint = text.codePointAt(offset);
+            String character = new String(Character.toChars(codePoint));
+            int size = (description ? HtmlUtil.escape(character) : character).getBytes(StandardCharsets.UTF_8).length;
+            // 留出省略号的三个 UTF-8 字节，避免长流程名称使整条通知发送失败。
+            if (bytes + size > limit - 3) return result.append("…").toString();
+            result.append(character);
+            bytes += size;
+            offset += Character.charCount(codePoint);
+        }
+        return result.toString();
+    }
+
     /**
      * 发送微信文本消息。
      * 接收人来自全局消息服务传入的用户ID或登录名，方法内部转换为 Sys_user 后取工号发送；

src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java

@@ -606,6 +606,9 @@ public class TourMySignupController {
         if (StrUtil.isBlank(ledger.getMobile())) {
             return Result.error("手机号不能为空");
         }
+        if (!ledger.getMobile().matches("^1[3-9]\\d{9}$")) {
+            return Result.error("请输入正确的11位手机号");
+        }
         return null;
     }
 

src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java

@@ -841,6 +841,9 @@ public class TourSignupController {
         if (StrUtil.isBlank(ledger.getMobile())) {
             return Result.error("手机号不能为空");
         }
+        if (!ledger.getMobile().matches("^1[3-9]\\d{9}$")) {
+            return Result.error("请输入正确的11位手机号");
+        }
         return null;
     }
 

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialMineController.java

@@ -86,7 +86,8 @@ public class GrassrootsCongressMaterialMineController {
             cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
         }
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
-            cnd.and(Cnd.likeEX("info.meetingName", pageForm.getSearchKeyword()));
+            // searchKeyword 为资料名称关键词，按资料表的 materialsName 字段模糊匹配。
+            cnd.and(Cnd.likeEX("info.materialsName", pageForm.getSearchKeyword()));
         }
         cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear());
         cnd.desc("info.createdTime");

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java

@@ -35,7 +35,6 @@ public class ProposalQueryYearReportController {
      */
     private static final Map<String, String> YEAR_REPORT_ORDER_COLUMNS = Map.ofEntries(
             Map.entry("code", "info.code"),
-            Map.entry("caseFilingCode", "info.caseFilingCode"),
             Map.entry("name", "info.name"),
             Map.entry("createUserName", "info.createUserName"),
             Map.entry("typeName", "typeName"),

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java

@@ -97,7 +97,7 @@ public class ProposalSeniorBasicController {
             return Result.error("提案编号已存在");
         }
 
-        dao.update(proposalInfo,"^code|caseFilingCode|name|typeId|brief|measures|excerpt|suggestUnits|files$");
+        dao.update(proposalInfo,"^code|name|typeId|brief|measures|excerpt|suggestUnits|files$");
         return Result.success();
     }
 

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

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.Dict;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -11,6 +12,7 @@ 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.param.ProposalSearchParam;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService;
 import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,16 +46,24 @@ public class ProposalCommitteeFilingController {
     @Inject
     private ProposalCommitteeFilingService proposalCommitteeFilingService;
     @Inject
+    private ProposalCommitteeFilingUnitService proposalCommitteeFilingUnitService;
+    @Inject
     private ProposalCommonService proposalCommonService;
 
     @At("")
-    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html")
+    @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html")
     @SaCheckPermission("proposal.committeeFiling")
     public void index() {
     }
 
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html")
+    @SaCheckPermission("h5.proposal.committeeFiling")
+    public void h5Index() {
+    }
+
     @At
-    @SaCheckPermission("proposal.committeeFiling")
+    @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR)
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
         Sql sql = Sqls.create("""
@@ -112,7 +122,7 @@ public class ProposalCommitteeFilingController {
             cnd.desc("t.createdAt");
         }
         sql.setCondition(cnd);
-        Pagination pagination = proposalCommitteeFilingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        Pagination pagination = proposalCommitteeFilingUnitService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
     }
 
@@ -126,11 +136,11 @@ public class ProposalCommitteeFilingController {
     }
 
     @At
-    @SaCheckPermission("proposal.committeeFiling")
+    @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR)
     @ApiOperation("执行单案立案审核任务")
     @Aop(TransAop.READ_COMMITTED)
     public Result executeTask(@Param("data") String data) {
-        // data 包含流程任务ID、提交类型、立案结果及主协办单位；Service 校验负责人后执行 WF，成功返回统一 Result。
+        // data 包含流程任务 ID、提交类型、提案 ID、立案结果及主协办单位；Service 先保存立案数据再执行 WF，成功返回统一 Result。
         Dict args = Json.fromJson(Dict.class, data);
         proposalCommitteeFilingService.executeFlowTask(args);
         return Result.success();

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

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -34,13 +35,13 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 团长审核
+ * 分工会主席审核
  */
 @IocBean
 @At("/platform/proposal/delegation")
 @Slf4j
 @Ok("json:full")
-@Api(tags = "提案-办理-团长审核")
+@Api(tags = "提案-办理-分工会主席审核")
 public class ProposalDelegationController {
 
     @Inject
@@ -60,12 +61,12 @@ public class ProposalDelegationController {
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html")
-    @SaCheckPermission("proposal.delegation")
+    @SaCheckPermission("h5.proposal.delegation")
     public void h5Index() {
     }
 
     @At
-    @SaCheckPermission("proposal.delegation")
+    @SaCheckPermission(value = {"proposal.delegation", "h5.proposal.delegation"}, mode = SaMode.OR)
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) {
         Sql sql = Sqls.create("""
@@ -116,7 +117,7 @@ public class ProposalDelegationController {
         }
         ProposalSearchParam.buildSearch(cnd, pageForm);
         cnd.groupBy("t.id");
-        // 团长审核列表未指定有效排序时保留任务创建时间倒序。
+        // 分工会主席审核列表未指定有效排序时保留任务创建时间倒序。
         if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "delegation")) {
             cnd.desc("t.createdAt");
         }

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

@@ -229,14 +229,18 @@ public class ProposalMineController {
     }
 
 
+    /**
+     * 删除当前用户可删除的提案。
+     *
+     * @param id 提案 ID；仅允许删除本人未发起流程或退回发起节点的提案
+     * @return Result，成功时返回成功结果，不满足删除条件时返回原因
+     */
     @At
     @SaCheckPermission("proposal.mine")
     @Aop(TransAop.READ_COMMITTED)
     @SLog(tag = "提案管理系统-我的提案", msg = "删除提案")
     public Result delete(@Valid String id) {
-        dao.delete(ProposalInfo.class, id);
-        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
-        return Result.success();
+        return proposalCommonService.deleteMine(id, SecurityUtil.getUserId());
     }
 
     @At

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

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.ExportTableColumns;
@@ -30,15 +31,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author FKY
- * @name：ProposalPreAuditController
+ * @name：校工会主席审核（复用原预审核页面）
  * @Date 2026/3/16 17:30
  * @注释
  */
 @IocBean
-@At("/platform/proposal/pre/audit")
+@At("/platform/proposal/schoolUnionChairApproval")
 @Slf4j
 @Ok("json:full")
-@Api(tags = "提案管理-校工会预审核")
+@Api(tags = "提案管理-校工会主席审核")
 public class ProposalPreAuditController {
 
     @Inject
@@ -48,18 +49,18 @@ public class ProposalPreAuditController {
 
     @At("")
     @Ok("beetl:/platform/zhgh/democratic/proposal/transact/preAudit/index.html")
-    @SaCheckPermission("proposal.preAudit")
+    @SaCheckPermission("proposal.schoolUnionChairApproval")
     public void index() {
     }
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/preAudit/index.html")
-    @SaCheckPermission("proposal.preAudit")
+    @SaCheckPermission("h5.proposal.schoolUnionChairApproval")
     public void h5Index() {
     }
 
     @At
-    @SaCheckPermission("proposal.preAudit")
+    @SaCheckPermission(value = {"proposal.schoolUnionChairApproval", "h5.proposal.schoolUnionChairApproval"}, mode = SaMode.OR)
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
         Sql sql = Sqls.create("""
@@ -98,7 +99,8 @@ public class ProposalPreAuditController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "preAudit");
+        // 校工会主席沿用预审核界面，待办必须按已发布流程的实际节点编码筛选。
+        cnd.and("t.taskName", "=", "schoolUnionChairApproval");
 
         if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
@@ -113,8 +115,8 @@ public class ProposalPreAuditController {
         cnd.andEX("vu.unionId", "=", pageForm.getUnionId());
         ProposalSearchParam.buildSearch(cnd, pageForm);
         cnd.groupBy("t.id");
-        // 预审核列表未指定有效排序时保留任务创建时间倒序。
-        if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "preAudit")) {
+        // 校工会主席审核列表未指定有效排序时保留任务创建时间倒序。
+        if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "schoolUnionChairApproval")) {
             cnd.desc("t.createdAt");
         }
         sql.setCondition(cnd);
@@ -124,10 +126,10 @@ public class ProposalPreAuditController {
 
     @At
     @Ok("void")
-    @SaCheckPermission("proposal.preAudit")
+    @SaCheckPermission("proposal.schoolUnionChairApproval")
     @ApiOperation("导出列表")
     public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval,
                            @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) {
-        proposalCommonService.exportWorkflowList("preAudit", pageForm, approval, tableColumns, response);
+        proposalCommonService.exportWorkflowList("schoolUnionChairApproval", pageForm, approval, tableColumns, response);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,7 +14,6 @@ import com.budwk.app.base.vo.LabelValueVO;
 import com.budwk.app.flow.constant.FlowConst;
 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.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.flow.service.ProcessTaskService;
@@ -70,12 +70,12 @@ public class ProposalSchoolLeaderApprovalController {
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html")
-    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @SaCheckPermission("h5.proposal.schoolLeaderApproval")
     public void h5Index() {
     }
 
     @At
-    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR)
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
 //        List<LabelValueVO> vos = processTaskService.jumpAbleTaskNameList(280L);
@@ -121,7 +121,7 @@ public class ProposalSchoolLeaderApprovalController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "schoolLeader");
+        cnd.and("t.taskName", "=", "school_leader");
 
         if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
@@ -163,18 +163,13 @@ public class ProposalSchoolLeaderApprovalController {
     }
 
     @At
-    @SaCheckPermission("proposal.schoolLeaderApproval")
+    @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR)
     @ApiOperation("执行任务")
     @Aop(TransAop.READ_COMMITTED)
     public Result executeTask(@Param("data") String data) {
         Dict args = Json.fromJson(Dict.class, data);
 
-		if("back".equals(args.getStr("tf_approval"))) {
-			args.put("submitType", ProcessSubmitTypeEnum.JUMP.getCode());
-			args.put("taskName", "committee");
-			flowCommonService.executeTask(args);
-			return Result.success();
-		}
+        // 退回答复由已发布的 WF 分支按 tf_approval=back 流转到主办单位答复。
 
         String proposalId = args.getStr("proposalId");
 

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

@@ -44,7 +44,9 @@ public class ProposalUnSubmitQueryController {
         Sql sql = Sqls.create("""
                 	SELECT
                 	distinct
-                	info.id,
+                    info.id,
+                    ins.id AS instanceId,
+                    ins.processDefineId AS instanceProcessDefineId,
                     info.code as proposalCode,
                     info.name as proposalName,
                     vu.username,
@@ -55,15 +57,17 @@ public class ProposalUnSubmitQueryController {
                     manner.name as mannerName,
                     (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id) AS secondedNum,
                     (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id and isAgree = 1) AS secondedAgreeNum,
-                    IF(info.stateCode <= 200 ,'未审核','已审核') AS delegationAudit
+                    IF(EXISTS (SELECT 1 FROM wf_process_task dt WHERE dt.processInstanceId = ins.id
+                        AND dt.taskName = 'delegation' AND dt.taskState = 20), '已审核', '未审核') AS delegationAudit
                 FROM
                 	proposal_info info
                 	left join vw_user vu on info.createUserId = vu.id
                 	left join teacher_congress_delegation tcd on info.delegationId = tcd.id
                 	left join proposal_type pt on info.typeId = pt.id
                 	left join sys_dict manner on manner.`code` = info.source
-                	left join `wf_process_instance` ins on ins.businessNo = info.id
-                	left join wf_process_task nt on nt.processInstanceId = ins.id
+				left join `wf_process_instance` ins on ins.id = (
+                    select latest.id from wf_process_instance latest
+                    where latest.businessNo = info.id order by latest.createdAt desc, latest.id desc limit 1)
                 $condition
         """);
         Cnd cnd = Cnd.NEW();
@@ -76,6 +80,8 @@ public class ProposalUnSubmitQueryController {
         SqlExpressionGroup group2 = Cnd.exps("ins.state", "=", 30);
         group2.or("ins.state", "=", 45);
         group2.or(new Static("ins.id not in (select processInstanceId from wf_process_task where taskName='delegation')"));
+        // 尚未发起 WF 实例的提案也属于未提交汇总，不能被 NOT IN 的 NULL 判断排除。
+        group2.orIsNull("ins.id");
         cnd.and(group2);
 
         if(searchName != null && StrUtil.isNotBlank(searchKeyword)) {

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

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import com.budwk.app.base.constant.RoleConstant;
@@ -70,12 +71,12 @@ public class ProposalUnderTakeReplyController {
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html")
-    @SaCheckPermission("proposal.unitReply")
+    @SaCheckPermission("h5.proposal.unitReply")
     public void h5Index() {
     }
 
     @At
-    @SaCheckPermission("proposal.unitReply")
+    @SaCheckPermission(value = {"proposal.unitReply", "h5.proposal.unitReply"}, mode = SaMode.OR)
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval, boolean transfer) {
         /*
@@ -134,8 +135,8 @@ public class ProposalUnderTakeReplyController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-//        cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
-        cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply"));
+        // 当前已发布的 WF 版本使用主办、协办和建议办理三个答复节点。
+        cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
 
         if (!SecurityUtil.getUserLoginname().equals("superadmin")) {
             cnd.and("ta.actorId", "=", SecurityUtil.getUserId());
@@ -159,9 +160,9 @@ public class ProposalUnderTakeReplyController {
         for (NutMap row : list) {
             /*
              * 承办单位答复撤回必须按“当前整组待办节点”统一判断。
-             * 这里不能再用 contains，只要出现过 unit_reply/two_unit_reply 就会误判可撤回；
+         * 这里不能再用 contains，否则出现过其他答复节点时会误判可撤回；
              * 正确规则是：curTaskKey 必须精确等于某一个允许撤回的节点编码，
-             * 像 unit_reply,two_unit_reply 这种混合状态一律不允许撤回。
+         * 多个答复节点同时存在的混合状态一律不允许撤回。
              */
             row.setv("canRevoke", isReplyTaskGroupRevocable(row));
         }
@@ -173,9 +174,8 @@ public class ProposalUnderTakeReplyController {
     /**
      * 承办单位答复节点撤回需要基于整组当前节点判断。
      * 只有“当前流程正在办理的节点”和“这条列表记录所属节点”完全一致时，才允许撤回；
-     * 这样流程已经从 unit_reply 走到 two_unit_reply 后，历史 unit_reply 记录会自动失去撤回资格。
-     * 主办只能撤回 unit_reply、two_unit_reply、school_leader；
-     * 协办只能撤回 unit_reply、two_unit_reply。
+     * 这样流程进入后续节点后，历史答复记录会自动失去撤回资格。
+         * 主办只能在主办或建议办理节点仍为当前节点时撤回；协办只能在协办节点撤回。
      */
     private boolean isReplyTaskGroupRevocable(NutMap row) {
         if (!ObjectUtil.equal(row.getInt("taskState"), ProcessTaskStateEnum.FINISHED.getCode())) {
@@ -187,10 +187,10 @@ public class ProposalUnderTakeReplyController {
             return false;
         }
         if (row.getInt("underTakeIsMaster") == 1) {
-            return Stream.of("unit_reply", "two_unit_reply", "school_leader")
+            return Stream.of("master_reply", "opinion_master_reply")
                     .anyMatch(a -> ObjectUtil.equal(a, taskKey));
         }
-        return Stream.of("unit_reply", "two_unit_reply")
+        return Stream.of("slave_reply")
                 .anyMatch(a -> ObjectUtil.equal(a, taskKey));
     }
 
@@ -200,7 +200,7 @@ public class ProposalUnderTakeReplyController {
 
     @At
     @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("proposal.unitReply")
+    @SaCheckPermission(value = {"proposal.unitReply", "h5.proposal.unitReply"}, mode = SaMode.OR)
     @ApiOperation("执行任务")
     public Result executeTask(@Param("data") String data) {
         Dict args = Json.fromJson(Dict.class, data);

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalApplicantBranchUnionChairmanAssignmentHandler.java

@@ -0,0 +1,75 @@
+package com.budwk.app.zhgh.democratic.proposal.handler;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.views.View_user;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+import java.util.List;
+
+/**
+ * 按提案申请人所属分工会分配主席审核人，不使用当前附议人的组织信息。
+ */
+public class ProposalApplicantBranchUnionChairmanAssignmentHandler implements AssignmentHandler {
+
+    /**
+     * 从流程业务编号定位提案申请人，再查询其所属分工会已启用的主席角色用户。
+     *
+     * @param model 当前审核任务模型，无需额外配置人员参数
+     * @param execution 流程执行上下文，流程实例的 businessNo 应为提案 ID
+     * @return 分工会主席用户 ID 列表；申请人或主席配置缺失时抛出业务异常
+     */
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        String proposalId = execution.getProcessInstance().getBusinessNo();
+        ProposalInfo proposal = StrUtil.isBlank(proposalId) ? null : dao.fetch(ProposalInfo.class, proposalId);
+        if (proposal == null || StrUtil.isBlank(proposal.getCreateUserId())) {
+            throw new BaseException("提案申请人不存在，无法分配分工会主席审核人");
+        }
+
+        View_user applicant = dao.fetch(View_user.class, Cnd.where(View_user::getId, "=", proposal.getCreateUserId()));
+        if (applicant == null || StrUtil.isBlank(applicant.getUnionId())) {
+            throw new BaseException("提案申请人未设置所属分工会，无法分配主席审核人");
+        }
+
+        Sys_role chairmanRole = ServiceContext.find(SysRoleService.class)
+                .getByCode(RoleConstant.BRANCH_UNION_CHAIRMAN);
+        if (chairmanRole == null) {
+            throw new BaseException("分工会主席角色不存在，请联系校工会进行设置");
+        }
+        List<String> chairmanIds = dao.query(Sys_user_role.class,
+                        Cnd.where(Sys_user_role::getRoleId, "=", chairmanRole.getId())
+                                .and(Sys_user_role::getUnionId, "=", applicant.getUnionId())
+                                .and(Sys_user_role::getEnable, "=", true))
+                .stream()
+                .map(Sys_user_role::getUserId)
+                .filter(StrUtil::isNotBlank)
+                .distinct()
+                .toList();
+        if (chairmanIds.isEmpty()) {
+            throw new BaseException("提案申请人所属分工会没有设置主席，请联系校工会进行设置");
+        }
+        return chairmanIds;
+    }
+
+    @Override
+    public String getMessage() {
+        return "提案申请人所属分工会主席";
+    }
+
+    @Override
+    public int getOrder() {
+        return 10;
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java

@@ -19,8 +19,6 @@ public class ProposalQueryComprehensiveParam extends PageForm {
     private String name;
     @ApiModelProperty(name = "提案编号")
     private String code;
-    @ApiModelProperty(name = "立案编号")
-    private String caseFilingCode;
     @ApiModelProperty(name = "教代会ID")
     private String sessionId;
     @ApiModelProperty(name = "search session id")
@@ -63,7 +61,7 @@ public class ProposalQueryComprehensiveParam extends PageForm {
     @ApiModelProperty(name = "通用关键字")
     private String commonKeyword;
 
-    @ApiModelProperty(name = "提案名称或编号搜索字段，仅支持name、code、caseFilingCode")
+    @ApiModelProperty(name = "提案名称或编号搜索字段，仅支持name、code")
     private String proposalSearchField;
 
     @ApiModelProperty(name = "提案名称或编号搜索内容")
@@ -77,7 +75,7 @@ public class ProposalQueryComprehensiveParam extends PageForm {
      * 将综合查询参数追加到查询条件中，无返回值，处理结果直接写入 cnd。
      *
      * @param cnd 查询条件容器，用于接收届次、名称/编号、提案人、组织及立案条件
-     * @param searchParam 页面查询参数；proposalSearchField 传 name、code 或 caseFilingCode，
+     * @param searchParam 页面查询参数；proposalSearchField 传 name 或 code，
      *                    proposalKeyword 传对应字段的模糊搜索内容
      */
     public static void buildSearch(Cnd cnd, ProposalQueryComprehensiveParam searchParam) {
@@ -93,12 +91,11 @@ public class ProposalQueryComprehensiveParam extends PageForm {
         // Isolated single-session filter for pages that should not reuse sessionId semantics.
         cnd.andEX("info.sessionId", "=", searchParam.getSearchSessionId());
 
-        // 名称/编号组合搜索仅允许三个固定字段，前端提交值不能直接作为SQL字段使用。
+        // 名称/编号组合搜索仅允许两个固定字段，前端提交值不能直接作为SQL字段使用。
         if (StrUtil.isNotBlank(searchParam.getProposalKeyword())) {
             String proposalSearchColumn = switch (StrUtil.blankToDefault(searchParam.getProposalSearchField(), "name")) {
                 case "name" -> "info.name";
                 case "code" -> "info.code";
-                case "caseFilingCode" -> "info.caseFilingCode";
                 default -> null;
             };
             if (proposalSearchColumn != null) {
@@ -114,10 +111,6 @@ public class ProposalQueryComprehensiveParam extends PageForm {
         if (StrUtil.isNotBlank(searchParam.getCode())) {
             cnd.where().andLike("info.code", searchParam.getCode());
         }
-        // 立案编号由立案环节生成，支持按已生成编号进行模糊检索。
-        if (StrUtil.isNotBlank(searchParam.getCaseFilingCode())) {
-            cnd.where().andLike("info.caseFilingCode", searchParam.getCaseFilingCode());
-        }
         //代表团ID
         cnd.andEX("info.delegationId", "=", searchParam.getDelegationId());
         if (StrUtil.isNotBlank(searchParam.getCreateUserName())) {

src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalSearchParam.java

@@ -24,7 +24,7 @@ public class ProposalSearchParam extends PageForm {
     private String createUserLoginName;
     private String createUserKeyword;
     private String caseFilingResult;
-    /** 名称/编号组合搜索字段，仅支持 name、code、caseFilingCode。 */
+    /** 名称/编号组合搜索字段，仅支持 name、code。 */
     private String proposalSearchField;
     /** 名称/编号组合搜索内容。 */
     private String proposalKeyword;
@@ -33,7 +33,7 @@ public class ProposalSearchParam extends PageForm {
      * 将提案列表参数追加到查询条件中，无返回值，处理结果直接写入 cnd。
      *
      * @param cnd 查询条件容器，用于接收名称/编号、届次、提案人及立案结果条件
-     * @param searchParam 页面查询参数；proposalSearchField 传 name、code 或 caseFilingCode，
+     * @param searchParam 页面查询参数；proposalSearchField 传 name 或 code，
      *                    proposalKeyword 传对应字段的模糊搜索内容
      */
     public static void buildSearch(Cnd cnd, ProposalSearchParam searchParam) {
@@ -45,7 +45,6 @@ public class ProposalSearchParam extends PageForm {
             String proposalSearchColumn = switch (StrUtil.blankToDefault(searchParam.getProposalSearchField(), "name")) {
                 case "name" -> "info.name";
                 case "code" -> "info.code";
-                case "caseFilingCode" -> "info.caseFilingCode";
                 default -> null;
             };
             if (proposalSearchColumn != null) {

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

@@ -3,6 +3,7 @@ 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.base.result.Result;
 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.ProposalQueryComprehensiveParam;
@@ -19,6 +20,15 @@ import java.util.Set;
 
 public interface ProposalCommonService extends BaseService<ProposalInfo> {
 
+    /**
+     * 删除当前用户尚未发起流程或已退回发起节点的提案。
+     *
+     * @param id 待删除的提案 ID
+     * @param userId 当前登录用户 ID，用于核对提案创建人
+     * @return Result，删除成功返回 success；提案不存在、非本人或流程不允许删除时返回错误信息
+     */
+    Result deleteMine(String id, String userId);
+
     /**
      * 按页面允许的字段白名单添加排序条件，避免前端字段直接进入SQL。
      *

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

@@ -17,6 +17,7 @@ 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.page.Pagination;
+import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.PageUtil;
@@ -52,6 +53,7 @@ import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import lombok.extern.slf4j.Slf4j;
 import org.ddr.poi.html.HtmlRenderPolicy;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.FieldFilter;
@@ -62,6 +64,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
@@ -82,16 +85,7 @@ import java.util.stream.Collectors;
 @IocBean(args = {"refer:dao"})
 public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> implements ProposalCommonService {
 
-    /** 确定立案提案的 Word 模板编码。 */
-    private static final String PROPOSAL_CONFIRM_FILING_TEMPLATE_CODE = "proposal_confirm_filing";
-
-    /** 工作建议提案的 Word 模板编码。 */
-    private static final String PROPOSAL_SUGGESTION_TEMPLATE_CODE = "proposal_suggestion";
-
-    /** 不予立案提案的 Word 模板编码。 */
-    private static final String PROPOSAL_NOT_TEMPLATE_CODE = "proposal_not";
-
-    /** 历史提案立案结果为空或无法识别时使用的原 Word 模板编码。 */
+    /** 所有立案结果统一使用重庆工贸提案征集表模板。 */
     private static final String PROPOSAL_DEFAULT_TEMPLATE_CODE = "proposal";
 
     /** PC端提案列表页面的排序字段白名单，页面代码由对应Controller固定传入。 */
@@ -103,7 +97,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     /** 征集进度页面允许排序的字段，避免排序参数直接拼接到SQL。 */
     private static final Map<String, String> COLLECT_PROGRESS_ORDER_COLUMNS = Map.ofEntries(
             Map.entry("code", "info.code"),
-            Map.entry("caseFilingCode", "info.caseFilingCode"),
             Map.entry("name", "info.name"),
             Map.entry("createUserName", "info.createUserName"),
             Map.entry("delegationName", "delegationName"),
@@ -116,7 +109,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     /** 征集进度页面允许自定义导出的字段及固定表头。 */
     private static final Map<String, String> COLLECT_PROGRESS_EXPORT_COLUMNS = Map.ofEntries(
             Map.entry("code", "提案编号"),
-            Map.entry("caseFilingCode", "立案编号"),
             Map.entry("name", "提案名称"),
             Map.entry("createUserName", "提案人"),
             Map.entry("delegationName", "代表团"),
@@ -147,7 +139,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     /** 综合查询页面允许排序的字段，避免前端排序参数直接进入SQL。 */
     private static final Map<String, String> COMPREHENSIVE_ORDER_COLUMNS = Map.ofEntries(
             Map.entry("code", "info.code"),
-            Map.entry("caseFilingCode", "info.caseFilingCode"),
             Map.entry("name", "info.name"),
             Map.entry("createUserName", "info.createUserName"),
             Map.entry("typeName", "typeName"),
@@ -163,7 +154,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     /** 综合查询页面允许自定义导出的字段及固定表头，防止请求伪造页面外字段。 */
     private static final Map<String, String> COMPREHENSIVE_EXPORT_COLUMNS = Map.ofEntries(
             Map.entry("code", "提案编号"),
-            Map.entry("caseFilingCode", "立案编号"),
             Map.entry("name", "提案名称"),
             Map.entry("createUserName", "提案人"),
             Map.entry("typeName", "提案类别"),
@@ -197,6 +187,45 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         super(dao);
     }
 
+    /**
+     * 仅允许创建人删除草稿或退回发起节点的提案，并清理其 WF 流程。
+     *
+     * @param id 待删除的提案 ID
+     * @param userId 当前登录用户 ID，用于核对提案创建人
+     * @return Result，删除成功返回 success；提案不存在、非本人或流程不允许删除时返回错误信息
+     */
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public Result deleteMine(String id, String userId) {
+        if (StrUtil.isBlank(id) || StrUtil.isBlank(userId)) {
+            return Result.error("提案不存在或无权删除");
+        }
+        ProposalInfo proposal = dao().fetch(ProposalInfo.class, id);
+        if (proposal == null || !Objects.equals(proposal.getCreatedBy(), userId)) {
+            return Result.error("提案不存在或无权删除");
+        }
+
+        List<ProcessInstance> instances = dao().query(ProcessInstance.class,
+                Cnd.where(ProcessInstance::getBusinessNo, "=", id));
+        // 一个提案出现多个流程实例时无法安全判断当前节点，拒绝删除并保留数据。
+        if (instances.size() > 1) {
+            return Result.error("提案流程数据异常，无法删除");
+        }
+        if (!instances.isEmpty()) {
+            ProcessInstance instance = instances.get(0);
+            List<ProcessTask> tasks = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+            // 存在并行任务时，只有所有活动任务均位于发起节点才允许删除。
+            if (!Objects.equals(instance.getState(), ProcessInstanceStateEnum.DOING.getCode())
+                    || tasks.isEmpty() || tasks.stream().anyMatch(task -> !Objects.equals(task.getTaskName(), "startTask"))) {
+                return Result.error("仅未提交或退回发起节点的提案可以删除");
+            }
+        }
+
+        dao().delete(ProposalInfo.class, id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
     /**
      * 分页查询提案综合列表。
      * 普通查询不关联历史任务表；仅在 origins 包含 answer 且 commonKeyword 非空时，
@@ -402,10 +431,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     keywordCondition.orLike("info.createUserName", keyword);
                     keywordCondition.orLike("info.createUserLoginName", keyword);
                 }
-                // 立案编号由立案环节生成，选中该搜索来源时按编号进行模糊匹配。
-                if (ArrayUtil.contains(pageForm.getOrigins(), "caseFilingCode")) {
-                    keywordCondition.orLike("info.caseFilingCode", keyword);
-                }
                 if (searchAnswer) {
                     keywordCondition.orLike("JSON_EXTRACT(replyTask.variable,'$.tf_opinion')", keyword);
                 }
@@ -469,7 +494,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     info.id,
                     info.name,
                     info.code,
-                    info.caseFilingCode,
                     info.createUserName,
                     type.NAME AS typeName,
                     tcs.fullName AS sessionName,
@@ -924,19 +948,20 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         pages.put("commissioner", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "CONFIRM_FILING_COUNT", "CONFIRM_FILING_COUNT", "SUGGESTION_COUNT", "SUGGESTION_COUNT", "NOT_COUNT", "NOT_COUNT", "taskName", "taskName", "instanceState", "ins.state"));
         pages.put("feedbackEvaluation", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "merge", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state"));
         pages.put("delegation", standardOrderColumns());
-        pages.put("control", mergeOrderColumns(standardOrderColumns(), orderColumns("caseFilingCode", "info.caseFilingCode")));
+        pages.put("control", standardOrderColumns());
         pages.put("schoolLeaderApproval", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "undertakeUnits", "masterUnitName", "merge", "merge", "curTaskName", "curTaskName", "auditUser", "auditUser", "instanceState", "ins.state"));
         pages.put("committeeFilingUnit", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "caseFilingResult", "info.caseFilingResult", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state"));
         pages.put("allFinished", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "instanceState", "ins.state"));
         pages.put("preAudit", standardOrderColumns());
+        pages.put("schoolUnionChairApproval", standardOrderColumns());
         pages.put("committeeFiling", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "caseFilingResult", "info.caseFilingResult", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state"));
         pages.put("caseCheck", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state", "finishTime", "t.finishTime"));
-        pages.put("exportComprehensive", orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "caseFilingType", "info.caseFilingType", "merge", "merge", "brief", "info.brief", "measures", "info.measures", "undertakeUnits", "masterUnitName", "curTaskName", "curTaskName", "instanceState", "ins.state"));
+        pages.put("exportComprehensive", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "caseFilingType", "info.caseFilingType", "merge", "merge", "brief", "info.brief", "measures", "info.measures", "undertakeUnits", "masterUnitName", "curTaskName", "curTaskName", "instanceState", "ins.state"));
         pages.put("exportSingleCustom", standardOrderColumns());
         pages.put("configUnit", orderColumns("name", "t1.name", "code", "t1.code", "unitLeader", "u2.username"));
         pages.put("configType", orderColumns("name", "name", "code", "code"));
         pages.put("seniorBasic", seniorOrderColumns());
-        pages.put("expediting", orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "curTaskName", "curTaskName", "underTakeName", "underTakeName", "taskName", "t.displayName", "actorName", "ta.actorName", "instanceState", "ins.state"));
+        pages.put("expediting", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "curTaskName", "curTaskName", "underTakeName", "underTakeName", "taskName", "t.displayName", "actorName", "ta.actorName", "instanceState", "ins.state"));
         pages.put("seniorDelete", seniorOrderColumns());
         pages.put("seniorFeedback", mergeOrderColumns(seniorOrderColumns(), orderColumns("tf_feedback", "tf_feedback")));
         pages.put("seniorType", seniorOrderColumns());
@@ -950,7 +975,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
     /** 创建高级管理列表共用的字段映射。 */
     private static Map<String, String> seniorOrderColumns() {
-        return orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "isConsolidation", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state");
+        return orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "isConsolidation", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state");
     }
 
     /**
@@ -1013,7 +1038,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
     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",
+        boolean requiresUnionFilter = Set.of("preAudit", "schoolUnionChairApproval", "committeeFiling", "committeeFilingUnit",
                 "schoolLeaderApproval", "caseCheck").contains(pageCode);
         String taskName = getWorkflowTaskName(pageCode);
 
@@ -1068,7 +1093,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
         Cnd cnd = Cnd.NEW();
         if (isUnitReply) {
-            cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply"));
+            cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
             if (!"superadmin".equals(SecurityUtil.getUserLoginname())) {
                 cnd.and("ta.actorId", "=", SecurityUtil.getUserId());
             }
@@ -1102,9 +1127,10 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         Map<String, String> taskNames = Map.of(
                 "delegation", "delegation",
                 "preAudit", "preAudit",
+                "schoolUnionChairApproval", "schoolUnionChairApproval",
                 "committeeFiling", "committee",
                 "committeeFilingUnit", "committeeFilingUnit",
-                "schoolLeaderApproval", "schoolLeader",
+                "schoolLeaderApproval", "school_leader",
                 "feedbackEvaluation", "feedback",
                 "caseCheck", "caseCheck"
         );
@@ -1170,22 +1196,23 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
     /** 初始化各办理页面可导出的列表字段白名单。 */
     private static Map<String, Set<String>> createWorkflowExportColumns() {
-        Set<String> commonColumns = Set.of("code", "caseFilingCode", "name", "createUserName", "typeName",
+        Set<String> commonColumns = Set.of("code", "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",
+        columns.put("schoolUnionChairApproval", commonColumns);
+        columns.put("caseCheck", Set.of("code", "name", "createUserName", "typeName",
                 "sessionName", "delegationName", "curTaskName", "instanceState", "finishTime"));
-        columns.put("committeeFiling", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName",
+        columns.put("committeeFiling", Set.of("code", "name", "typeName", "sessionName",
                 "caseFilingResult", "delegationName", "curTaskName", "instanceState"));
-        columns.put("committeeFilingUnit", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName",
+        columns.put("committeeFilingUnit", Set.of("code", "name", "typeName", "sessionName",
                 "caseFilingResult", "delegationName", "curTaskName", "instanceState"));
-        columns.put("schoolLeaderApproval", Set.of("code", "caseFilingCode", "name", "typeName", "undertakeUnits",
+        columns.put("schoolLeaderApproval", Set.of("code", "name", "typeName", "undertakeUnits",
                 "merge", "curTaskName", "auditUser", "instanceState"));
-        columns.put("unitReply", Set.of("code", "caseFilingCode", "name", "typeName", "caseFilingResult",
+        columns.put("unitReply", Set.of("code", "name", "typeName", "caseFilingResult",
                 "merge", "underTakeName", "underTakeIsMaster", "curTaskName", "auditUser", "instanceState"));
-        columns.put("feedbackEvaluation", Set.of("code", "caseFilingCode", "name", "typeName", "merge",
+        columns.put("feedbackEvaluation", Set.of("code", "name", "typeName", "merge",
                 "curTaskName", "instanceState"));
         return Collections.unmodifiableMap(columns);
     }
@@ -1373,6 +1400,11 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         execute(sql);
         NutMap docData = (NutMap) sql.getResult();
 
+        // 提案可能已被删除，避免在读取模板字段时产生空指针。
+        if (docData == null) {
+            throw new BaseException("提案信息不存在");
+        }
+
         //处理下富文本
         String brief = docData.getString("brief");
         String measures = docData.getString("measures");
@@ -1387,12 +1419,23 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         ProcessInstance processInstance = dao().fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", id));
 
         List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
-        List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(processInstance.getId(), null);
-        for (ProcessTask doneTask : doneTaskList) {
-            ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
-            doneTaskVos.add(taskVO);
+        // 尚未启动或缺少 WF 实例的提案仍导出基础信息，附议和审批栏保持为空。
+        if (processInstance != null) {
+            List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(processInstance.getId(), null);
+            for (ProcessTask doneTask : doneTaskList) {
+                ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
+                if (taskVO != null && taskVO.getExt() != null) {
+                    doneTaskVos.add(taskVO);
+                }
+            }
         }
 
+        // 附议人单元格仅展示已完成附议任务中的姓名，多人以顿号分隔并去重。
+        docData.put("secondNames", doneTaskVos.stream()
+                .filter(task -> "second".equals(task.getTaskName()))
+                .map(task -> task.getTaskFormData().getStr("userName"))
+                .filter(StrUtil::isNotBlank).distinct().collect(Collectors.joining("、")));
+
         // 按任务节点分组
         Map<String, List<ProcessTaskVO>> taskGroups = doneTaskVos.stream()
                 .filter(Objects::nonNull)
@@ -1400,6 +1443,17 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         docData.putAll(taskGroups);
         putProposalExportTaskAliases(id, taskGroups, docData);
 
+        // 中文区块名称保持与现有模板一致，实际审核记录按 WF 节点编码匹配。
+        // 区块内继续读取 taskFormData 的意见、姓名和日期；无记录时写入空列表，避免同名节点误填。
+        Map<String, String> approvalTemplateNodes = Map.of(
+                "分工会主席审批", "delegation",
+                "校工会主席审批", "schoolUnionChairApproval",
+                "分管校领导审批", "school_leader");
+        approvalTemplateNodes.forEach((templateKey, taskName) -> docData.put(templateKey, doneTaskVos.stream()
+                .filter(task -> taskName.equals(task.getTaskName()))
+                .sorted(Comparator.comparing(ProcessTaskVO::getFinishTime, Comparator.nullsLast(Comparator.naturalOrder())))
+                .collect(Collectors.toList())));
+
         // 提案附议
         List<NutMap> secondInfos = new ArrayList<>();
         List<ProcessTaskVO> secondTaskVos = taskGroups.get("提案附议");
@@ -1481,29 +1535,13 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         docData.put("secondedList", secondInfos);
         docData.put("delegationAuditList", delegationAuditList);
 
-        String templateCode = getProposalTemplateCode(docData.getString("caseFilingResult"));
         try {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateCode), config).render(docData).writeAndClose(byteArrayOutputStream);
+            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(PROPOSAL_DEFAULT_TEMPLATE_CODE), config).render(docData).writeAndClose(byteArrayOutputStream);
         } catch (IOException e) {
             log.error("提案导出失败{}，提案id:{}", e.getMessage(), id);
         }
     }
 
-    /**
-     * 根据立案结果选择数据库办公模板编码。
-     *
-     * @param caseFilingResult 立案结果字典编码：CONFIRM_FILING、SUGGESTION 或 NOT
-     * @return 对应的 Word 模板编码；历史空值或未知编码返回 proposal
-     */
-    private String getProposalTemplateCode(String caseFilingResult) {
-        return switch (StrUtil.nullToEmpty(caseFilingResult)) {
-            case "CONFIRM_FILING" -> PROPOSAL_CONFIRM_FILING_TEMPLATE_CODE;
-            case "SUGGESTION" -> PROPOSAL_SUGGESTION_TEMPLATE_CODE;
-            case "NOT" -> PROPOSAL_NOT_TEMPLATE_CODE;
-            default -> PROPOSAL_DEFAULT_TEMPLATE_CODE;
-        };
-    }
-
     /**
      * 将现行工作流节点映射到历史提案表模板使用的区块名称，并按主协办单位拆分办理答复。
      * 模板仍使用旧节点名称时，避免已完成的意见和答复因键名不一致而无法渲染。

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java

@@ -20,6 +20,7 @@ import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
 import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService;
+import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService;
 import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -44,6 +45,8 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl<Proposal
     @Inject
     private ProposalCommonService proposalCommonService;
     @Inject
+    private ProposalCommitteeFilingUnitService proposalCommitteeFilingUnitService;
+    @Inject
     private FlowCommonService flowCommonService;
     @Inject
     private ProcessTaskService processTaskService;
@@ -58,7 +61,8 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl<Proposal
     @Aop(TransAop.READ_COMMITTED)
     public void executeFlowTask(Dict args) {
         validateSelectedUnitLeaders(args);
-        flowCommonService.executeTask(args);
+        // 立案审核复用原确认承办单位的表单，业务字段和单位记录须在同一事务内先于 WF 流转保存。
+        proposalCommitteeFilingUnitService.executeFlowTask(args);
     }
 
     @Override
@@ -117,7 +121,7 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl<Proposal
             selectedUnitIds.addAll(getUnitIdList(args, FlowConst.TASK_FORM_DATA_PREFIX + "slaveUnitIds"));
         }
         if (selectedUnitIds.isEmpty()) {
-            return;
+            throw new BaseException("请选择主办或办理单位");
         }
 
         Sys_role unitLeaderRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingUnitServiceImpl.java

@@ -79,6 +79,21 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl<Prop
         if (currentTask == null) {
             throw new BaseException("没有进行中的流程任务");
         }
+        if (!"committee".equals(currentTask.getTaskName()) && !"committeeFilingUnit".equals(currentTask.getTaskName())) {
+            throw new BaseException("当前任务不是立案审核节点");
+        }
+
+        Integer submitType = args.getInt(FlowConst.SUBMIT_TYPE);
+        if (submitType == null) {
+            // 兼容未显式传提交类型的旧页面，默认按同意立案审核处理。
+            submitType = ProcessSubmitTypeEnum.AGREE.getCode();
+            args.put(FlowConst.SUBMIT_TYPE, submitType);
+        }
+        if (!ProcessSubmitTypeEnum.AGREE.getCode().equals(submitType)) {
+            // 退回或拒绝不形成立案结果，也不能清除上次已保存的承办单位。
+            flowCommonService.executeTask(args);
+            return;
+        }
 
         String proposalId = StrUtil.trim(args.getStr("proposalId"));
         if (StrUtil.isBlank(proposalId) || dao().fetch(ProposalInfo.class, proposalId) == null) {
@@ -90,7 +105,6 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl<Prop
         if (ObjectUtil.isEmpty(proposalIds)) {
             proposalIds = List.of(proposalId);
         }
-        generateAndNormalizeCaseFilingCode(args, proposalIds);
 
         /*
          * 先同步 proposal_info 和承办单位，再执行 WF 流转，使查看页面及下一节点读取到的都是本次最新数据。
@@ -114,129 +128,18 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl<Prop
     }
 
     /**
-     * 按立案结果和服务器当前年份生成立案编号，并覆盖页面可能传入的编号。
-     * 正常提交时生成编号；退回等非同意操作不占用流水号。并案提案共用同一个编号。
-     *
-     * @param args 流程提交参数，tf_caseFilingResult 分别支持 CONFIRM_FILING、SUGGESTION、NOT
-     * @param proposalIds 当前办理的提案主键集合，并案时包含同组全部提案
-     */
-    private void generateAndNormalizeCaseFilingCode(Dict args, List<String> proposalIds) {
-        String caseFilingResultKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult";
-        String caseFilingCodeKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingCode";
-        String caseFilingTypeKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingType";
-        String caseFilingResult = args.getStr(caseFilingResultKey);
-        if (!"CONFIRM_FILING".equals(caseFilingResult)) {
-            // 立案类型仅适用于确定立案，切换为其他结果时同步清理历史值。
-            args.put(caseFilingTypeKey, "");
-        }
-
-        Integer submitType = args.getInt(FlowConst.SUBMIT_TYPE);
-        if (submitType == null) {
-            submitType = ProcessSubmitTypeEnum.AGREE.getCode();
-            args.put(FlowConst.SUBMIT_TYPE, submitType);
-        }
-        if (!ProcessSubmitTypeEnum.AGREE.getCode().equals(submitType)) {
-            args.put(caseFilingCodeKey, "");
-            return;
-        }
-
-        String codePrefix = resolveCaseFilingCodePrefix(caseFilingResult);
-        int currentYear = java.time.LocalDate.now().getYear();
-        String codeHead = currentYear + codePrefix;
-
-        /*
-         * proposal_config 当前是单行配置表，锁定该行可让所有应用实例串行生成流水号。
-         * 行锁一直持有到本次 WF 提交事务结束，避免两个审核请求同时读到相同最大值。
-         */
-        Sql lockSql = Sqls.create("SELECT id FROM proposal_config ORDER BY id LIMIT 1 FOR UPDATE");
-        lockSql.setCallback(Sqls.callback.map());
-        dao().execute(lockSql);
-        Map<?, ?> configRow = lockSql.getObject(Map.class);
-        if (ObjectUtil.isEmpty(configRow)) {
-            throw new BaseException("提案配置不存在，无法生成立案编号");
-        }
-
-        String reusableCode = findReusableCaseFilingCode(proposalIds, caseFilingResult, codeHead);
-        if (StrUtil.isNotBlank(reusableCode)) {
-            args.put(caseFilingCodeKey, reusableCode);
-            return;
-        }
-
-        Sql maxSequenceSql = Sqls.create("""
-                SELECT COALESCE(MAX(CAST(SUBSTRING(caseFilingCode, 6) AS UNSIGNED)), 0)
-                FROM proposal_info
-                WHERE caseFilingCode REGEXP @codePattern
-                """);
-        maxSequenceSql.setParam("codePattern", "^" + codeHead + "[0-9]{3,}$");
-        maxSequenceSql.setCallback(Sqls.callback.integer());
-        dao().execute(maxSequenceSql);
-        int nextSequence = maxSequenceSql.getInt() + 1;
-        String caseFilingCode = codeHead + String.format("%03d", nextSequence);
-        args.put(caseFilingCodeKey, caseFilingCode);
-    }
-
-    /**
-     * 将立案结果转换成编号前缀，未知结果直接阻止流程提交，避免生成无业务含义的编号。
-     *
-     * @param caseFilingResult 立案结果编码
-     * @return 确定立案返回 A、工作建议返回 B、不予立案返回 C
-     */
-    private String resolveCaseFilingCodePrefix(String caseFilingResult) {
-        return switch (StrUtil.nullToEmpty(caseFilingResult)) {
-            case "CONFIRM_FILING" -> "A";
-            case "SUGGESTION" -> "B";
-            case "NOT" -> "C";
-            default -> throw new BaseException("立案结果不正确，无法生成立案编号");
-        };
-    }
-
-    /**
-     * 流程撤回或重新提交时，复用同一批提案已有的本年同类型编号，避免流水号无意义增长。
-     * 只有全部提案的结果和编号完全一致且符合新编号格式时才允许复用。
-     *
-     * @param proposalIds 当前单案或并案提案主键集合
-     * @param caseFilingResult 本次选择的立案结果
-     * @param codeHead 年份和编号前缀，例如 2026A
-     * @return 可复用的编号；不存在时返回空字符串
-     */
-    private String findReusableCaseFilingCode(List<String> proposalIds, String caseFilingResult, String codeHead) {
-        List<ProposalInfo> proposalInfos = dao().query(ProposalInfo.class,
-                Cnd.where(ProposalInfo::getId, "in", proposalIds));
-        if (proposalInfos.size() != new LinkedHashSet<>(proposalIds).size()) {
-            return "";
-        }
-        boolean allProposalsMatch = proposalInfos.stream().allMatch(proposalInfo ->
-                Objects.equals(caseFilingResult, proposalInfo.getCaseFilingResult())
-                        && StrUtil.isNotBlank(proposalInfo.getCaseFilingCode()));
-        if (!allProposalsMatch) {
-            return "";
-        }
-        LinkedHashSet<String> existingCodes = proposalInfos.stream()
-                .map(ProposalInfo::getCaseFilingCode)
-                .map(StrUtil::trim)
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-        if (existingCodes.size() != 1) {
-            return "";
-        }
-        String existingCode = existingCodes.iterator().next();
-        return existingCode.matches(codeHead + "\\d{3,}") ? existingCode : "";
-    }
-
-    /**
-     * old-flow 页面提交后，需要把立案编号、立案结果以及主协办单位同步落业务表。
+     * 立案审核提交后，只同步立案结果、立案类型和主协办单位，不生成立案编号。
      * 若这次改成“不予立案”等无需承办单位的结果，也要先清掉旧的承办单位记录，避免脏数据残留。
      */
     private void syncCommitteeFilingUnitData(List<String> proposalIds, Dict args) {
-        String caseFilingCode = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingCode");
         String caseFilingResult = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult");
         String caseFilingType = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingType");
 
         dao().update(ProposalInfo.class,
-                Chain.make("caseFilingCode", caseFilingCode)
-                        .add("caseFilingResult", caseFilingResult)
+                Chain.make("caseFilingResult", caseFilingResult)
                         .add("caseFilingType", caseFilingType),
                 Cnd.where(ProposalInfo::getId, "in", proposalIds));
-        verifyCommitteeFilingUnitData(proposalIds, caseFilingCode, caseFilingResult, caseFilingType);
+        verifyCommitteeFilingUnitData(proposalIds, caseFilingResult, caseFilingType);
 
         dao().clear(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "in", proposalIds));
         if (!List.of("CONFIRM_FILING", "SUGGESTION").contains(caseFilingResult)) {
@@ -276,7 +179,7 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl<Prop
     /**
      * 校验本次立案字段是否已同步到全部提案，避免流程变量更新成功但 info 基础信息仍保留旧值。
      */
-    private void verifyCommitteeFilingUnitData(List<String> proposalIds, String caseFilingCode,
+    private void verifyCommitteeFilingUnitData(List<String> proposalIds,
                                                String caseFilingResult, String caseFilingType) {
         List<ProposalInfo> proposalInfos = dao().query(ProposalInfo.class,
                 Cnd.where(ProposalInfo::getId, "in", proposalIds));
@@ -284,9 +187,7 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl<Prop
             throw new BaseException("部分提案信息不存在，无法同步立案结果");
         }
         boolean syncFailed = proposalInfos.stream().anyMatch(proposalInfo ->
-                !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingCode(), ""),
-                        StrUtil.nullToDefault(caseFilingCode, ""))
-                        || !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingResult(), ""),
+                !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingResult(), ""),
                         StrUtil.nullToDefault(caseFilingResult, ""))
                         || !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingType(), ""),
                         StrUtil.nullToDefault(caseFilingType, "")));

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java

@@ -189,7 +189,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     info.id,
                     info.name,
                     info.code,
-                    info.caseFilingCode,
                     info.caseFilingResult,
                     info.caseFilingType,
                     info.researchFindings,
@@ -259,7 +258,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
         exportEntities.add(new ExcelExportEntity("序号", "index", 10));
         exportEntities.add(new ExcelExportEntity("提案编号", "code", 20));
-        exportEntities.add(new ExcelExportEntity("立案编号", "caseFilingCode", 20));
         exportEntities.add(new ExcelExportEntity("立案结果", "caseFilingResultName", 15));
         exportEntities.add(new ExcelExportEntity("立案类型", "caseFilingTypeName", 15));
         exportEntities.add(new ExcelExportEntity("是否并案", "isConsolidationName", 12));
@@ -318,7 +316,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
             NutMap proposalRow = proposalRows.computeIfAbsent(proposalId, key -> NutMap.NEW()
                     .addv("id", proposalId)
                     .addv("code", row.getString("code"))
-                    .addv("caseFilingCode", row.getString("caseFilingCode"))
                     .addv("name", row.getString("name"))
                     .addv("createUserName", row.getString("createUserName"))
                     .addv("caseFilingResult", row.getString("caseFilingResult"))
@@ -373,7 +370,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                 SELECT DISTINCT
                     info.id,
                     info.code,
-                    info.caseFilingCode,
                     info.name,
                     info.createUserName,
                     info.caseFilingResult,
@@ -413,9 +409,8 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
             LinkedHashSet<String> masterUnitNames = getUnitNameSet(proposalRow, "masterUnitNames");
             LinkedHashSet<String> slaveUnitNames = getUnitNameSet(proposalRow, "slaveUnitNames");
             NutMap excelRow = NutMap.NEW()
-                    // 承办单位表统一展示为“立案编号”；未生成立案编号的工作建议回退显示提案编号。
-                    .addv("caseFilingCode", StrUtil.blankToDefault(proposalRow.getString("caseFilingCode"),
-                            proposalRow.getString("code")))
+                    // 承办单位表只展示提案编号，立案结果不再生成独立编号。
+                    .addv("code", proposalRow.getString("code"))
                     .addv("name", proposalRow.getString("name"))
                     .addv("createUserName", proposalRow.getString("createUserName"))
                     .addv("masterUnitNames", "")
@@ -434,7 +429,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         }
         if (!suggestionRows.isEmpty()) {
             filingRows.add(NutMap.NEW()
-                    .addv("caseFilingCode", WORK_SUGGESTION_SECTION_MARKER)
+                    .addv("code", WORK_SUGGESTION_SECTION_MARKER)
                     .addv("name", "")
                     .addv("createUserName", "")
                     .addv("masterUnitNames", "")
@@ -450,7 +445,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
      */
     private Workbook buildUndertakeUnitWorkbook(String title, String unitName, List<NutMap> excelRows) {
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
-        exportEntities.add(new ExcelExportEntity("立案编号", "caseFilingCode", 11));
+        exportEntities.add(new ExcelExportEntity("提案编号", "code", 11));
         exportEntities.add(new ExcelExportEntity("提案名称", "name", 43));
         exportEntities.add(new ExcelExportEntity("提案人", "createUserName", 13));
         exportEntities.add(new ExcelExportEntity("主办单位", "masterUnitNames", 19));
@@ -925,7 +920,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     info.id,
                     info.name,
                     info.code,
-                    info.caseFilingCode,
                     info.caseFilingResult,
                     info.caseFilingType,
                     info.researchFindings,

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalUnderTakeReplyServiceImpl.java

@@ -336,7 +336,7 @@ public class ProposalUnderTakeReplyServiceImpl extends BaseServiceImpl<ProposalI
         if (replyTask == null) {
             throw new BaseException("未找到答复任务");
         }
-        if (!List.of("unit_reply", "two_unit_reply", "opinion_master_reply").contains(replyTask.getTaskName())) {
+        if (!List.of("master_reply", "slave_reply", "opinion_master_reply").contains(replyTask.getTaskName())) {
             throw new BaseException("当前任务不支持编辑答复内容");
         }
         if (!Objects.equals(ProcessTaskStateEnum.FINISHED.getCode(), replyTask.getTaskState())) {

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApprovalController.java

@@ -0,0 +1,60 @@
+package com.budwk.app.zhgh.staffbenefit.condolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+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.json.Json;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@Ok("json")
+@At("/platform/condolence/approval")
+public class CondolenceApprovalController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        if (args == null || args.getLong(FlowConst.PROCESS_TASK_ID_KEY) == null) {
+            throw new BaseException("审批任务不能为空");
+        }
+        ProcessTask task = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        if (task == null) throw new BaseException("审批任务不存在");
+        if (!"4dad0bef-3cf2-4a7d-bba3-35020b9b216d".equals(task.getTaskName())
+                && !"34f7938e-47a3-4b3a-b4e0-92b7a3f47865".equals(task.getTaskName())
+                && !"ecdaef3b-edf4-4143-9a96-887dd5921711".equals(task.getTaskName())
+                && !"cbd41337-3c87-4959-9027-809df5c7ef5e".equals(task.getTaskName())) {
+            throw new BaseException("当前任务不是职工慰问审批任务");
+        }
+        ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+        Condolence info = instance == null ? null : dao.fetch(Condolence.class, instance.getBusinessNo());
+        if (info == null) throw new BaseException("职工慰问申请不存在");
+        if (StrUtil.isBlank(args.getStr("tf_sign"))) throw new BaseException("请完成审批签字");
+        if (StrUtil.isBlank(args.getStr("tf_opinion"))) throw new BaseException("请填写审批意见");
+
+        // 参与者权限由流程引擎校验，业务入口不接受客户端指定管理员代办。
+        args.remove(FlowConst.EXT_ENABLE_OPERATOR);
+        flowCommonService.executeTask(args);
+        return Result.success();
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java

@@ -17,6 +17,7 @@ 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.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -27,7 +28,7 @@ import org.nutz.mvc.annotation.Param;
 import java.util.List;
 
 /**
- * @ClassName CondolenceBranchUnionApprovalController
+ * @ClassName CondolenceFirstApprovalController
  * @Author JyuHsin
  * @Date 2025/7/28 11:33
  * @Version 1.0
@@ -35,26 +36,26 @@ import java.util.List;
  */
 @IocBean
 @At("/platform/condolence/branchUnionApproval")
-@Api("职工慰问分工会审核")
+@Api("职工慰问一级审核")
 @Ok("json:full")
-public class CondolenceBranchUnionApprovalController {
+public class CondolenceFirstApprovalController {
 
 	@Inject
 	private CondolenceService condolenceService;
 
 	@At("/")
 	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html")
-	@SaCheckPermission("condolence.branchUnionApproval")
+	@SaCheckPermission("condolence.firstApproval")
 	public void index() {}
 
 	@At("/h5")
 	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html")
-	@SaCheckPermission("h5.condolence.branchUnionApproval")
+	@SaCheckPermission("h5.condolence.firstApproval")
 	public void h5Index() {}
 
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission(value = {"condolence.branchUnionApproval", "h5.condolence.branchUnionApproval"}, mode = SaMode.OR)
+	@SaCheckPermission(value = {"condolence.firstApproval", "h5.condolence.firstApproval"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "type") String type,
@@ -90,6 +91,14 @@ public class CondolenceBranchUnionApprovalController {
                 $condition
                 """);
 		Cnd cnd = Cnd.NEW();
+		cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
@@ -100,7 +109,9 @@ public class CondolenceBranchUnionApprovalController {
 		cnd.andEX("YEAR(info.createTime)", "=", year);
 
 		cnd.and("t.taskName", "=", "4dad0bef-3cf2-4a7d-bba3-35020b9b216d");
-		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		if (!"superadmin".equals(SecurityUtil.getUserLoginname())) {
+			cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		}
 
 		if (approval) {
 			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFourthApprovalController.java

@@ -0,0 +1,160 @@
+package com.budwk.app.zhgh.staffbenefit.condolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+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.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.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
+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 java.util.List;
+
+/**
+ * @ClassName CondolenceFourthApprovalController
+ * @Author JyuHsin
+ * @Date 2025/7/29 16:23
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/condolence/fourthApproval")
+@Api("职工慰问四级审核")
+@Ok("json:full")
+public class CondolenceFourthApprovalController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private CondolenceService condolenceService;
+
+	@At("/")
+	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html")
+	@SaCheckPermission("condolence.fourthApproval")
+	public void index() {}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html")
+	@SaCheckPermission("h5.condolence.fourthApproval")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"condolence.fourthApproval", "h5.condolence.fourthApproval"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "unionId") String unionId,
+						   @Param(value = "unitId") String unitId,
+						   @Param(value = "approval") Boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  type.name as typeName,
+                  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,
+                  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 condolence info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN condolence_type type ON info.type = type.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(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.andEX("info.type", "=", type);
+		cnd.andEX("YEAR(info.createTime)", "=", year);
+		cnd.andEX("info.applyUnionId", "=", unionId);
+		cnd.andEX("info.applyUnitId", "=", unitId);
+
+		cnd.and("t.taskName", "=", "cbd41337-3c87-4959-9027-809df5c7ef5e");
+        if (!"superadmin".equals(SecurityUtil.getUserLoginname()) && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            Sql unitSql = Sqls.queryString("""
+                    SELECT DISTINCT ur.unitId
+                    FROM sys_user_role ur
+                    INNER JOIN sys_role r ON r.id = ur.roleId
+                    WHERE ur.userId = @userId
+                      AND ur.enable = true
+                      AND r.disabled = false
+                      AND r.code = @roleCode
+                      AND ur.unitId IS NOT NULL
+                      AND ur.unitId <> ''
+                    """);
+            unitSql.setParam("userId", SecurityUtil.getUserId());
+            unitSql.setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name());
+            dao.execute(unitSql);
+            List<String> managedUnitIds = unitSql.getList(String.class);
+            if (managedUnitIds.isEmpty()) {
+                cnd.and(new Static("1 = 0"));
+            } else {
+                cnd.and("info.applyUnitId", "in", managedUnitIds);
+            }
+        }
+
+		if (approval) {
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+		} else {
+			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+		}
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("info.createTime");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		cnd.groupBy("t.id");
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -3,23 +3,35 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
 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.exception.BaseException;
 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.sms.SmsService;
 import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.base.utils.SysOfficeTemplateUtil;
 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.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.vo.ProcessTaskVO;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
+import com.deepoove.poi.data.PictureRenderData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
@@ -34,6 +46,10 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.List;
+
 /**
  * @ClassName CondolenceApplyController
  * @Author JyuHsin
@@ -41,6 +57,7 @@ import org.nutz.mvc.annotation.Param;
  * @Version 1.0
  * @Description TODO
  */
+@Slf4j
 @IocBean
 @At("/platform/condolence/mine")
 @Api("职工慰问我的")
@@ -51,6 +68,8 @@ public class CondolenceMineController {
 	private CondolenceService condolenceService;
 	@Inject
 	private FlowEngine flowEngine;
+	@Inject
+	private SysOfficeTemplateUtil sysOfficeTemplateUtil;
 
 	@At("/")
 	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/mine/index.html")
@@ -132,6 +151,98 @@ public class CondolenceMineController {
 		return Result.success(pagination);
 	}
 
+	@At
+	@Ok("void")
+	@ApiOperation("导出职工慰问申请表")
+	@SaCheckPermission("condolence.mine")
+	public void doExportApply(String id, HttpServletResponse response, Boolean print) throws Exception {
+		log.info("[职工慰问导出] 开始，applyId={}, userId={}, format={}", id, SecurityUtil.getUserId(), Boolean.TRUE.equals(print) ? "PDF" : "Word");
+		Condolence condolence = condolenceService.fetch(id);
+		if (condolence == null) throw new BaseException("该条记录不存在");
+		if (!SecurityUtil.getUserId().equals(condolence.getCreatedBy())) {
+			throw new BaseException("只能导出本人提交的申请");
+		}
+		ProcessInstance instance = condolenceService.dao().fetch(ProcessInstance.class,
+				Cnd.where("businessNo", "=", id).desc("id"));
+		if (instance == null || !ProcessInstanceStateEnum.FINISHED.getCode().equals(instance.getState())) {
+			throw new BaseException("只能导出已完成的申请");
+		}
+		log.info("[职工慰问导出] 流程已完成，applyId={}, instanceId={}, state={}, applicantSignPresent={}", id, instance.getId(), instance.getState(), StrUtil.isNotBlank(condolence.getSignature()));
+		NutMap docData = Lang.obj2nutmap(condolence);
+		docData.put("payUserName", StrUtil.nullToEmpty(condolence.getBankUserName()));
+		CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, condolence.getType());
+		docData.put("typeName", type == null ? "" : type.getName());
+		docData.put("signature", null);
+		if (StrUtil.isNotBlank(condolence.getSignature())) {
+			PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, condolence.getSignature());
+			if (signature == null) throw new BaseException("申请人签字图片读取失败");
+			docData.put("signature", signature);
+		}
+		fillApplyApprovals(docData, instance);
+		for (String field : List.of("signature", "firstApprovalSign", "secondApprovalSign", "thirdApprovalSign", "fourthApprovalSign")) {
+			Object value = docData.get(field);
+			log.info("[职工慰问导出] 渲染前图片字段，applyId={}, instanceId={}, field={}, valueType={}", id, instance.getId(), field, value == null ? "null" : value.getClass().getName());
+		}
+		String fileName = "重庆工贸职业技术学院职工慰问申请表_" + StrUtil.nullToEmpty(condolence.getHelpUserName());
+		try (InputStream input = getClass().getResourceAsStream("/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc")) {
+			if (input == null) throw new BaseException("职工慰问申请表模板不存在");
+			boolean pdf = Boolean.TRUE.equals(print);
+			byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, docData, null, pdf, "condolence:" + id);
+			log.info("[职工慰问导出] 渲染完成，applyId={}, format={}, outputBytes={}", id, pdf ? "PDF" : "Word", bytes.length);
+			CommonDownloadUtil.download(fileName + (pdf ? ".pdf" : ".docx"), bytes, response);
+		} catch (Exception e) {
+			log.error("[职工慰问导出] 模板渲染或文件输出失败，applyId={}, instanceId={}, format={}", id, instance.getId(), Boolean.TRUE.equals(print) ? "PDF" : "Word", e);
+			throw e;
+		}
+	}
+
+	private void fillApplyApprovals(NutMap docData, ProcessInstance instance) {
+		String[] taskKeys = {"4dad0bef-3cf2-4a7d-bba3-35020b9b216d", "34f7938e-47a3-4b3a-b4e0-92b7a3f47865",
+				"ecdaef3b-edf4-4143-9a96-887dd5921711", "cbd41337-3c87-4959-9027-809df5c7ef5e"};
+		String[] fields = {"firstApproval", "secondApproval", "thirdApproval", "fourthApproval"};
+		List<String> suffixes = List.of("Opinion", "Sign", "Year", "Month", "Day");
+		for (String field : fields) {
+			for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+		}
+		List<ProcessTask> tasks = condolenceService.dao().query(ProcessTask.class,
+				Cnd.where("processInstanceId", "=", instance.getId()).asc("id"));
+		log.info("[职工慰问导出] 查询审批记录，applyId={}, instanceId={}, taskCount={}, expectedTaskKeys={}", instance.getBusinessNo(), instance.getId(), tasks.size(), List.of(taskKeys));
+		for (ProcessTask task : tasks) {
+			ProcessTaskVO taskVO = flowEngine.processTaskService().findById(task.getId());
+			log.info("[职工慰问导出] 审批记录，instanceId={}, taskId={}, taskKey={}, displayName={}, state={}, finishTime={}, isFirstTaskNode={}, matchedApproval={}", instance.getId(), task.getId(), task.getTaskName(), task.getDisplayName(), task.getTaskState(), task.getFinishTime(), taskVO.getExt() == null ? null : taskVO.getExt().get("isFirstTaskNode"), List.of(taskKeys).contains(task.getTaskName()));
+			if ("startTask".equals(task.getTaskName()) || (!List.of(taskKeys).contains(task.getTaskName())
+					&& taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+				log.info("[职工慰问导出] 申请节点重置本轮审批字段，instanceId={}, taskId={}, taskKey={}", instance.getId(), task.getId(), task.getTaskName());
+				// 重新申请后，仅导出本轮审批记录。
+				for (String field : fields) {
+					for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+				}
+				continue;
+			}
+			for (int i = 0; i < taskKeys.length; i++) {
+				if (!taskKeys[i].equals(task.getTaskName())) continue;
+				for (String suffix : suffixes) docData.put(fields[i] + suffix, "Sign".equals(suffix) ? null : "");
+				if (!ProcessTaskStateEnum.FINISHED.getCode().equals(task.getTaskState())) {
+					log.info("[职工慰问导出] 跳过未完成审批，instanceId={}, taskId={}, field={}, state={}", instance.getId(), task.getId(), fields[i], task.getTaskState());
+					continue;
+				}
+				Dict data = taskVO.getExt() == null ? Dict.create() : taskVO.getTaskFormData();
+				log.info("[职工慰问导出] 读取审批表单，instanceId={}, taskId={}, field={}, formKeys={}, signPresent={}, signReferenceLength={}", instance.getId(), task.getId(), fields[i], data.keySet(), StrUtil.isNotBlank(data.getStr("sign")), StrUtil.nullToEmpty(data.getStr("sign")).length());
+				if (StrUtil.isBlank(data.getStr("sign"))) log.warn("[职工慰问导出] 已完成审批缺少签名字段，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i]);
+				docData.put(fields[i] + "Opinion", StrUtil.nullToEmpty(data.getStr("opinion")));
+				if (StrUtil.isNotBlank(data.getStr("sign"))) {
+					PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, data.getStr("sign"));
+					if (signature == null) throw new BaseException("审批签字图片读取失败");
+					docData.put(fields[i] + "Sign", signature);
+					log.info("[职工慰问导出] 审批签名填充完成，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i] + "Sign");
+				}
+				docData.put(fields[i] + "Year", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy"));
+				docData.put(fields[i] + "Month", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "M"));
+				docData.put(fields[i] + "Day", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "d"));
+			}
+		}
+	}
+
 	@At
 	@ApiOperation("删除")
 	@Aop(TransAop.READ_COMMITTED)

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java

@@ -6,14 +6,13 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
-import com.budwk.app.base.constant.RoleConstant;
 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.CommonDownloadUtil;
 import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.entity.ProcessInstance;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.sys.param.SysMsgSummaryPageForm;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -94,10 +93,12 @@ public class CondolenceReadController {
 				$condition
 				""");
 		Cnd cnd = Cnd.NEW();
+		cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
 		cnd.andEX("info.type", "=", type);
 		cnd.andEX("YEAR(info.createTime)", "=", year);
 		cnd.andEX("info.applyUnionId", "=", unionId);
 		cnd.andEX("info.applyUnitId", "=", unitId);
+		applyReadScope(cnd, "info");
 
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
@@ -106,9 +107,6 @@ public class CondolenceReadController {
 			cnd.and(seg);
 		}
 
-		if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-			cnd.and("info.applyUnionId", "=", SecurityUtil.getUnionId());
-		}
 
 		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
 			cnd.desc("info.createTime");
@@ -142,20 +140,18 @@ public class CondolenceReadController {
 				$condition
 				""");
 		Cnd cnd = Cnd.NEW();
-		cnd.and(ProcessInstance::getState, "=", ProcessTaskStateEnum.FINISHED.getCode());
+		cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
 		cnd.andEX("con.type", "=", type);
-		cnd.andEX("YEAR(info.createTime)", "=", year);
+		cnd.andEX("YEAR(con.createTime)", "=", year);
 		cnd.andEX("con.applyUnionId", "=", unionId);
 		cnd.andEX("con.applyUnitId", "=", unitId);
+		applyReadScope(cnd, "con");
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
-			seg.or("info.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("con.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("con.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
-		if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-			cnd.and("con.applyUnionId", "=", SecurityUtil.getUnionId());
-		}
 		sql.setCondition(cnd);
 		List<NutMap> list = condolenceService.listMap(sql);
 
@@ -174,4 +170,21 @@ public class CondolenceReadController {
 		Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
 		CommonDownloadUtil.download("申报人汇总.xlsx", workbook, response);
 	}
+
+	private void applyReadScope(Cnd cnd, String alias) {
+		if (AuthUtil.hasPermission("condolence_all_school")) {
+			return;
+		}
+		if (AuthUtil.hasPermission("condolence_branch_union")) {
+			String unionId = SecurityUtil.getUnionId();
+			if (StrUtil.isNotBlank(unionId)) {
+				cnd.and(alias + ".applyUnionId", "=", unionId);
+				return;
+			}
+		} else if (AuthUtil.hasPermission("condolence_self")) {
+			cnd.and(alias + ".createdBy", "=", SecurityUtil.getUserId());
+			return;
+		}
+		cnd.and("1", "=", 0);
+	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java

@@ -17,6 +17,7 @@ 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.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -33,26 +34,26 @@ import java.util.List;
  */
 @IocBean
 @At("/platform/condolence/schoolPrincipalApproval")
-@Api("职工慰问校工会预审")
+@Api("职工慰问二级审核")
 @Ok("json:full")
-public class CondolenceSchoolPrincipalApprovalController {
+public class CondolenceSecondApprovalController {
 
     @Inject
     private CondolenceService condolenceService;
 
     @At("/")
     @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html")
-    @SaCheckPermission("condolence.schoolPrincipalApproval")
+    @SaCheckPermission("condolence.secondApproval")
     public void index() {}
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html")
-    @SaCheckPermission("h5.condolence.schoolPrincipalApproval")
+    @SaCheckPermission("h5.condolence.secondApproval")
     public void h5Index() {}
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"condolence.secondApproval", "h5.condolence.secondApproval"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            @Param(value = "year") Integer year,
                            @Param(value = "type") String type,
@@ -90,6 +91,14 @@ public class CondolenceSchoolPrincipalApprovalController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
+        cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup seg = new SqlExpressionGroup();
             seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java

@@ -17,6 +17,7 @@ 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.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -27,7 +28,7 @@ import org.nutz.mvc.annotation.Param;
 import java.util.List;
 
 /**
- * @ClassName CondolenceSchoolUnionApprovalController
+ * @ClassName CondolenceThirdApprovalController
  * @Author JyuHsin
  * @Date 2025/7/29 16:23
  * @Version 1.0
@@ -35,26 +36,26 @@ import java.util.List;
  */
 @IocBean
 @At("/platform/condolence/schoolUnionApproval")
-@Api("职工慰问校工会审核")
+@Api("职工慰问三级审核")
 @Ok("json:full")
-public class CondolenceSchoolUnionApprovalController {
+public class CondolenceThirdApprovalController {
 
 	@Inject
 	private CondolenceService condolenceService;
 
 	@At("/")
 	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html")
-	@SaCheckPermission("condolence.schoolUnionApproval")
+	@SaCheckPermission("condolence.thirdApproval")
 	public void index() {}
 
 	@At("/h5")
 	@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html")
-	@SaCheckPermission("h5.condolence.schoolUnionApproval")
+	@SaCheckPermission("h5.condolence.thirdApproval")
 	public void h5Index() {}
 
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR)
+	@SaCheckPermission(value = {"condolence.thirdApproval", "h5.condolence.thirdApproval"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "type") String type,
@@ -92,6 +93,14 @@ public class CondolenceSchoolUnionApprovalController {
                 $condition
                 """);
 		Cnd cnd = Cnd.NEW();
+		cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
@@ -104,7 +113,9 @@ public class CondolenceSchoolUnionApprovalController {
 		cnd.andEX("info.applyUnitId", "=", unitId);
 
 		cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711");
-		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		if (!"superadmin".equals(SecurityUtil.getUserLoginname())) {
+			cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		}
 
 		if (approval) {
 			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java

@@ -1,10 +1,10 @@
 package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 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.flow.constant.FlowConst;
@@ -112,6 +112,7 @@ public class DifficultHelpApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}")
     public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) {
+        difficultHelpCommonService.validateApplyUser(difficultHelpInfo, false);
         difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date()));
         difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
         if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
@@ -128,6 +129,7 @@ public class DifficultHelpApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "困难补助申请", msg = "提交申请,填写人: ${args[0].proxyUserName}")
     public Result submit(@Param("data") DifficultHelpInfo difficultHelpInfo){
+        difficultHelpCommonService.validateApplyUser(difficultHelpInfo);
         difficultHelpInfo.setApplyTime(new Date());
         difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
         if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
@@ -156,6 +158,7 @@ public class DifficultHelpApplyController {
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "困难补助申请", msg = "重新提交申请,填写人: ${args[0].proxyUserName}")
     public Result submitAgain(@Param("data") DifficultHelpInfo difficultHelpInfo, @Param("taskId") Long taskId) {
+        difficultHelpCommonService.validateApplyUser(difficultHelpInfo);
         difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date()));
         difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
         if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
@@ -174,8 +177,15 @@ public class DifficultHelpApplyController {
 
     @At
     @ApiOperation("获取受助人")
-    @SaCheckPermission("difficultHelp.apply")
+    @SaCheckPermission(value = {"difficultHelp.apply", "h5.difficultHelp.apply"}, mode = SaMode.OR)
     public Result queryRecipients(String key){
+        boolean schoolScope = AuthUtil.hasPermission("difficult_assistance_school");
+        if (!schoolScope && !AuthUtil.hasPermission("difficult_assistance_union")) {
+            return Result.error("没有代申请权限");
+        }
+        if (!schoolScope && Strings.isBlank(SecurityUtil.getUnionId())) {
+            return Result.error("当前用户未设置所属分工会");
+        }
         Sql sql = Sqls.create("""
                 SELECT
                 	id,
@@ -184,6 +194,10 @@ public class DifficultHelpApplyController {
                 	birthday,
                 	mobile,
                 	sex,
+                    idCard,
+                    position,
+                    professionalTitle AS officialCapacity,
+                    (SELECT u.homeAddress FROM sys_user u WHERE u.id = vw_user.id) AS homeAddress,
                 	unitName,
                 	unionName,
                 	unionId,
@@ -194,12 +208,8 @@ public class DifficultHelpApplyController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.and("id", "<>", SecurityUtil.getUserId());
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {
-                cnd.and("unionid", "=", SecurityUtil.getUnionId());
-            } else {
-                cnd.and("id", "=", SecurityUtil.getUserId());
-            }
+        if (!schoolScope) {
+            cnd.and("unionid", "=", SecurityUtil.getUnionId());
         }
 
         if (Strings.isNotBlank(key)) {

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApprovalController.java

@@ -0,0 +1,83 @@
+package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+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.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+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.json.Json;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@Ok("json")
+@At("/platform/difficultHelp/approval")
+public class DifficultHelpApprovalController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        if (args == null || args.getLong(FlowConst.PROCESS_TASK_ID_KEY) == null) {
+            throw new BaseException("审批任务不能为空");
+        }
+        ProcessTask task = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        if (task == null) throw new BaseException("审批任务不存在");
+        boolean actualAmountApproval = "e405f96c-5fc0-4f63-b323-e69dfe853253".equals(task.getTaskName());
+        boolean amountApproval = "715ece82-4ae3-433c-ad18-ed875f45d1e3".equals(task.getTaskName());
+        if (!amountApproval && !"36ebafda-44c2-4bd3-bd7f-10839a575a0d".equals(task.getTaskName())
+                && !"e405f96c-5fc0-4f63-b323-e69dfe853253".equals(task.getTaskName())) {
+            throw new BaseException("当前任务不是困难帮扶审批任务");
+        }
+        ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+        DifficultHelpInfo info = instance == null ? null : dao.fetch(DifficultHelpInfo.class, instance.getBusinessNo());
+        if (info == null) throw new BaseException("困难帮扶申请不存在");
+        if (StrUtil.isBlank(args.getStr("tf_sign"))) throw new BaseException("请完成审批签字");
+        if (StrUtil.isBlank(args.getStr("tf_opinion"))) throw new BaseException("请填写审批意见");
+
+        args.remove("level");
+        args.remove("tf_level");
+        args.remove("tf_actualMoney");
+        Double money = amountApproval ? args.getDouble("money") : null;
+        if (amountApproval) {
+            if (money == null || !Double.isFinite(money) || money < 0) {
+                throw new BaseException("请填写有效的帮扶金额");
+            }
+            args.put("tf_money", money);
+        } else {
+            args.remove("money");
+            args.remove("tf_money");
+            if (actualAmountApproval && info.getMoney() != null) {
+                args.put("tf_money", info.getMoney());
+                args.put("tf_actualMoney", info.getMoney());
+            }
+        }
+        // 参与者权限由流程引擎校验，业务入口不接受客户端指定管理员代办。
+        args.remove(FlowConst.EXT_ENABLE_OPERATOR);
+        flowCommonService.executeTask(args);
+        if (amountApproval && Integer.valueOf(ProcessSubmitTypeEnum.AGREE.getCode()).equals(args.getInt(FlowConst.SUBMIT_TYPE))) {
+            dao.update(DifficultHelpInfo.class, Chain.make("money", money), Cnd.where("id", "=", info.getId()));
+        }
+        return Result.success();
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpFirstApprovalController.java

@@ -2,10 +2,12 @@ package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
+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.utils.PageUtil;
 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.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
@@ -14,6 +16,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -25,15 +28,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpBranchUnionApprovalController
+ * @name：DifficultHelpFirstApprovalController
  * @Date 2025/7/31 11:47
- * @注释
+ * @注释 困难帮扶一级审批
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助分工会审核")
+@ApiOperation("困难帮扶一级审批")
 @At("/platform/difficultHelp/branchUnionApproval")
-public class DifficultHelpBranchUnionApprovalController {
+public class DifficultHelpFirstApprovalController {
 
     @Inject
     private Dao dao;
@@ -41,27 +44,27 @@ public class DifficultHelpBranchUnionApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
+    @SaCheckPermission("difficultHelp.firstApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
+    @SaCheckPermission("difficultHelp.firstApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.branchUnionApproval")
+    @SaCheckPermission("h5.difficultHelp.firstApproval")
     @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html")
     public void h5() {
     }
 
 
     @At
-    @ApiOperation("困难补助分工会审核列表")
-    @SaCheckPermission("difficultHelp.branchUnionApproval")
+    @ApiOperation("困难帮扶一级审批列表")
+    @SaCheckPermission("difficultHelp.firstApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -75,6 +78,7 @@ public class DifficultHelpBranchUnionApprovalController {
                     info.subsidyStandards,
                     LEFT(info.applyTime, 10) AS applyTime,
                     info.applyCount,
+                    info.applyMoney,
                     info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
@@ -102,10 +106,21 @@ public class DifficultHelpBranchUnionApprovalController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        pageParam.buildSearch(cnd, "info.");
+        cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+        boolean schoolApproval = AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_OFFICE_DIRECTOR.name());
+        pageParam.buildSearch(cnd, "info.", !schoolApproval);
 
-        cnd.and("t.taskName", "=", "9d11798e-a0e4-4ff5-939b-e6c5519e0eb6");
-        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.and("t.taskName", "=", "36ebafda-44c2-4bd3-bd7f-10839a575a0d");
+        if (!schoolApproval) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
 
         if (pageParam.getAudit()) {
             cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
@@ -68,6 +69,7 @@ public class DifficultHelpMineController {
         Sql sql = Sqls.create("""
                 SELECT
                     info.id,
+                    info.createdBy,
                     info.proxyUserName,
                     info.proxyLoginName,
                     info.userName,
@@ -78,6 +80,7 @@ public class DifficultHelpMineController {
                     LEFT(info.applyTime, 10) AS applyTime,
                     info.applyCount,
                     info.mobile,
+                    info.applyMoney,
                     info.money,
                     ins.id AS instanceId,
                     ins.businessNo,
@@ -103,7 +106,8 @@ public class DifficultHelpMineController {
                 """);
         Cnd cnd = Cnd.NEW();
         pageParam.buildSearch(cnd, "info.");
-        cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+        cnd.and(Cnd.exps("info.createdBy", "=", SecurityUtil.getUserId())
+                .or("info.userId", "=", SecurityUtil.getUserId()));
         if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
             cnd.desc("info.applyTime");
         } else {
@@ -121,6 +125,10 @@ public class DifficultHelpMineController {
     @SaCheckPermission("difficultHelp.mine")
     @SLog(tag = "困难补助申请", msg = "删除困难补助申请，id: ${args[0]}")
     public Result onDelete(@Valid String id){
+        DifficultHelpInfo helpInfo = dao.fetch(DifficultHelpInfo.class, id);
+        if (helpInfo == null || !SecurityUtil.getUserId().equals(helpInfo.getCreatedBy())) {
+            return Result.error("只能删除自己创建的申请记录");
+        }
         dao.clear(DifficultHelpInfo.class, Cnd.where("id", "=", id));
         // 删除流程相关操作
         flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
@@ -130,7 +138,7 @@ public class DifficultHelpMineController {
 
     @At
     @ApiModelProperty("获取困难补助申请")
-    @SaCheckPermission("difficultHelp.mine")
+    @SaCheckPermission(value = {"difficultHelp.mine", "difficultHelp.reading"}, mode = SaMode.OR)
     public Result findOne(String id) {
         DifficultHelpInfo helpInfo = dao.fetch(DifficultHelpInfo.class, id);
         return Result.success().addData(helpInfo);

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java

@@ -2,25 +2,25 @@ package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 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.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.MoneyUtil;
-import com.budwk.app.base.utils.OfficePlusUtil;
 import com.budwk.app.base.utils.SysOfficeTemplateUtil;
 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.vo.ProcessTaskVO;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.sys.services.SysUserService;
@@ -35,7 +35,6 @@ import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommon
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.moneyImportVo;
 import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPageForm;
-import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
@@ -70,8 +69,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -155,7 +152,7 @@ public class DifficultHelpReadingController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.and("ins.state", "=", 20);
-        pageParam.buildSearch(cnd, "info.");
+        pageParam.buildReadingSearch(cnd, "info.");
         cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
@@ -239,6 +236,7 @@ public class DifficultHelpReadingController {
 
     @At
     @Ok("void")
+    @SaCheckPermission("difficultHelp.reading")
     public void doExportAllApply(DifficultHelpPageParam pageParam, HttpServletResponse response) throws Exception {
         Sql sql = Sqls.create("""
             SELECT
@@ -269,7 +267,7 @@ public class DifficultHelpReadingController {
             $condition
             """);
         Cnd cnd = Cnd.NEW();
-        pageParam.buildSearch(cnd, "info.");
+        pageParam.buildReadingSearch(cnd, "info.");
         cnd.groupBy("info.id");
         sql.setCondition(cnd);
         List<NutMap> list = difficultHelpCommonService.listMap(sql);
@@ -282,42 +280,14 @@ public class DifficultHelpReadingController {
             for (int i = 0; i < list.size(); i++) {
                 NutMap record = list.get(i);
 
-                HashMap<String, Object> docData = new HashMap<>();
-                docData.put("unionName", record.getString("unitName"));
-                docData.put("proxyUserName", record.getString("proxyUserName"));
-                docData.put("sex", record.getString("sex"));
-                docData.put("loginName", record.getString("loginName"));
-                docData.put("unitName", record.getString("unitName"));
-                docData.put("homeIncome", record.getDouble("homeIncome"));
-                docData.put("homeNumber", record.getInt("homeNumber"));
-                docData.put("position", record.getString("position"));
-                docData.put("officialCapacity", record.getString("officialCapacity"));
-                docData.put("mobile", record.getString("mobile"));
-                docData.put("userName", record.getString("userName"));
-                docData.put("homeAddress", record.getString("homeAddress"));
-                docData.put("bankOfDeposit", record.getString("bankOfDeposit"));
-                docData.put("bankCardNum", record.getString("bankCardNum"));
-                docData.put("reason", record.getString("reason"));
-                docData.put("applyTime", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy年MM月dd日"));
-                docData.put("schoolname", "中国地质大学（武汉）");
-                docData.put("year", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy"));
-
-                String familyListStr = record.getString("familyList");
-                if (StrUtil.isNotBlank(familyListStr)) {
-                    docData.put("familyList", JSONUtil.toList(familyListStr, Object.class));
-                } else {
-                    docData.put("familyList", new ArrayList<>());
+                DifficultHelpInfo difficultHelp = difficultHelpCommonService.fetch(record.getString("id"));
+                if (difficultHelp == null) {
+                    throw new IllegalStateException("待导出的申请记录不存在：" + record.getString("id"));
                 }
-
-                String fileName = (i + 1) + record.getString("userName") + "申请表.docx";
+                byte[] bytes = renderApplyDocument(difficultHelp, false);
+                String fileName = (i + 1) + difficultHelp.getUserName() + "申请表.docx";
                 zipOutputStream.putNextEntry(new ZipEntry(fileName));
-
-                LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
-                Configure config = Configure.builder().bind("familyList", policy).build();
-
-                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("difficulty_apply"), config)
-                        .render(docData)
-                        .write(zipOutputStream);
+                zipOutputStream.write(bytes);
                 zipOutputStream.closeEntry();
             }
             zipOutputStream.flush();
@@ -327,11 +297,41 @@ public class DifficultHelpReadingController {
 
     @At
     @Ok("void")
+    @SaCheckPermission("difficultHelp.reading")
+    public void exportReadingApply(String id, DifficultHelpPageParam pageParam, HttpServletResponse response, Boolean print) throws Exception {
+        Cnd cnd = Cnd.where("id", "=", id);
+        pageParam.buildReadingSearch(cnd, "");
+        if (difficultHelpCommonService.count(cnd) == 0) {
+            throw new RuntimeException("该记录不在当前可查看的范围内，无法导出");
+        }
+        doExportApply(id, response, print);
+    }
+
+    @At
+    @Ok("void")
+    @SaCheckLogin
     public void doExportApply(String id, HttpServletResponse response,  Boolean print) throws Exception {
         DifficultHelpInfo difficultHelp = difficultHelpCommonService.fetch(id);
         if (difficultHelp == null) {
             throw new RuntimeException("该条记录不存在");
         }
+        boolean ownApply = AuthUtil.hasPermission("difficultHelp.mine")
+                && SecurityUtil.getUserId().equals(difficultHelp.getCreatedBy());
+        if (!ownApply) {
+            Cnd cnd = Cnd.where("id", "=", id);
+            new DifficultHelpPageParam().buildReadingSearch(cnd, "");
+            if (!AuthUtil.hasPermission("difficultHelp.reading") || difficultHelpCommonService.count(cnd) == 0) {
+                throw new RuntimeException("该记录不在当前可查看的范围内，无法导出");
+            }
+        }
+        boolean pdf = Boolean.TRUE.equals(print);
+        String fileName = FileUtil.mainName(sysOfficeTemplateUtil.getTemplateFileName("difficulty_apply")) + "_" + difficultHelp.getUserName() + "_" +
+                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + (pdf ? ".pdf" : ".docx");
+        byte[] bytes = renderApplyDocument(difficultHelp, pdf);
+        CommonDownloadUtil.download(fileName, bytes, response);
+    }
+
+    private byte[] renderApplyDocument(DifficultHelpInfo difficultHelp, boolean pdf) throws Exception {
         HashMap<String, Object> docData = new HashMap<>();
 
         docData.put("unionName", difficultHelp.getUnitName());
@@ -361,56 +361,90 @@ public class DifficultHelpReadingController {
                 .build();
 
         String templateName= "difficulty_apply";
-        if (print) {
-            exportAsPDF(templateName, docData, config, difficultHelp, response);
-        } else {
-            exportAsWord(templateName, docData, config, difficultHelp,response);
+        docData.put("applyMoney", difficultHelp.getApplyMoney());
+        docData.put("money", difficultHelp.getMoney());
+        fillApplyApprovals(docData, difficultHelp.getId());
+        try (InputStream input = getApplyTemplate(templateName)) {
+            return sysOfficeTemplateUtil.renderTemplate(input, docData, config, pdf, "difficulthelp:" + difficultHelp.getId());
         }
     }
 
-    @At
-    private void exportAsPDF(String templateName, HashMap<String, Object> docData,Configure config,
-                             DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
-        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
-                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";
-
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
-                    .render(docData)
-                    .writeAndClose(byteArrayOutputStream);
-            byte[] bytes = byteArrayOutputStream.toByteArray();
-            File sourceFile = File.createTempFile("file_convert_origin", ".docx");
-            Files.write(sourceFile.toPath(), bytes, StandardOpenOption.WRITE);
-
-            File pdfFile = File.createTempFile("file_convert", ".pdf");
-            OfficePlusUtil.convert(sourceFile.getPath(), pdfFile.getPath());
-            CommonDownloadUtil.download(fileName, IoUtil.readBytes(FileUtil.getInputStream(pdfFile)), response);
-            // 删除临时文件
-            FileUtil.del(sourceFile);
-            FileUtil.del(pdfFile.toPath());
-        } catch (IOException e) {
-            log.error("困难慰问申请表导出PDF失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+    private void fillApplyApprovals(HashMap<String, Object> docData, String businessId) {
+        String[] taskKeys = {"36ebafda-44c2-4bd3-bd7f-10839a575a0d", "715ece82-4ae3-433c-ad18-ed875f45d1e3", "e405f96c-5fc0-4f63-b323-e69dfe853253"};
+        String[] fields = {"firstApproval", "secondApproval", "thirdApproval"};
+        for (String field : fields) {
+            for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+        }
+        ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where("businessNo", "=", businessId).desc("id"));
+        if (instance == null) return;
+        List<ProcessTask> tasks = dao.query(ProcessTask.class, Cnd.where("processInstanceId", "=", instance.getId()).asc("id"));
+        for (ProcessTask task : tasks) {
+            ProcessTaskVO taskVO = flowEngine.processTaskService().findById(task.getId());
+            if ("startTask".equals(task.getTaskName()) || (!List.of(taskKeys).contains(task.getTaskName())
+                    && taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+                // 重新申请后，仅导出本轮审批，避免混入上一次退回或撤销前的意见。
+                for (String field : fields) {
+                    for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+                }
+                continue;
+            }
+            if (!Integer.valueOf(ProcessTaskStateEnum.FINISHED.getCode()).equals(task.getTaskState())) continue;
+            for (int i = 0; i < taskKeys.length; i++) {
+                if (!taskKeys[i].equals(task.getTaskName())) continue;
+                cn.hutool.core.lang.Dict data = taskVO.getTaskFormData();
+                String opinion = StrUtil.nullToEmpty(data.getStr("opinion"));
+                docData.put(fields[i] + "Opinion", opinion);
+                docData.put(fields[i] + "User", StrUtil.nullToEmpty(data.getStr("userName")));
+                if (StrUtil.isNotBlank(data.getStr("sign"))) {
+                    PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, data.getStr("sign"));
+                    if (signature == null) throw new IllegalStateException("审批签字图片读取失败");
+                    docData.put(fields[i] + "Sign", signature);
+                }
+                docData.put(fields[i] + "Date", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy-MM-dd"));
+                docData.put(fields[i] + "Year", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy"));
+                docData.put(fields[i] + "Month", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "M"));
+                docData.put(fields[i] + "Day", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "d"));
+                String approval = "审批意见：" + opinion;
+                approval += "\n审批人：" + StrUtil.nullToEmpty(data.getStr("userName"));
+                approval += "\n审批日期：" + (task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy-MM-dd"));
+                docData.put(fields[i], approval);
+            }
         }
     }
 
-    @At
-    private void exportAsWord(String templateName, HashMap<String, Object> docData,Configure config,
-                              DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
-        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
-                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";
-
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
-                    .render(docData)
-                    .writeAndClose(byteArrayOutputStream);
-            CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response);
-        } catch (IOException e) {
-            log.error("困难慰问申请表导出Word失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+    private InputStream getApplyTemplate(String templateName) throws Exception {
+        byte[] templateBytes;
+        try (InputStream input = sysOfficeTemplateUtil.getTemplate(templateName)) {
+            templateBytes = input.readAllBytes();
         }
+        // 按审批栏限定通用日期占位符，同时将旧版 Word 模板转换为 DOCX。
+        try (ByteArrayInputStream input = new ByteArrayInputStream(templateBytes);
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            com.aspose.words.Document document = new com.aspose.words.Document(input);
+            com.aspose.words.NodeCollection cells = document.getChildNodes(com.aspose.words.NodeType.CELL, true);
+            for (int index = 0; index < cells.getCount(); index++) {
+                com.aspose.words.Cell cell = (com.aspose.words.Cell) cells.get(index);
+                for (String field : List.of("firstApproval", "secondApproval", "thirdApproval")) {
+                    if (!cell.getText().contains("{{" + field + "Opinion}}")) continue;
+                    com.aspose.words.FindReplaceOptions options = new com.aspose.words.FindReplaceOptions();
+                    cell.getRange().replace("{{year}}", "{{" + field + "Year}}", options);
+                    cell.getRange().replace("{{month}}", "{{" + field + "Month}}", options);
+                    cell.getRange().replace("{{day}}", "{{" + field + "Day}}", options);
+                    if ("firstApproval".equals(field)) {
+                        cell.getRange().replace("{{secondApprovalUser}}", "{{firstApprovalUser}}", options);
+                    }
+                    cell.getRange().replace("{{" + field + "User}}", "{{@" + field + "Sign}}", options);
+                }
+            }
+            document.save(output, com.aspose.words.SaveFormat.DOCX);
+            templateBytes = output.toByteArray();
+        }
+        return new ByteArrayInputStream(templateBytes);
     }
 
     @At
     @Ok("void")
+    @SaCheckPermission("difficultHelp.reading")
     public void exportSummary(DifficultHelpPageParam pageParam,String flag,
                               HttpServletResponse response) throws Exception {
         NutMap result = new NutMap();
@@ -433,6 +467,7 @@ public class DifficultHelpReadingController {
                     info.subsidyStandards,
                     info.bankOfDeposit,
                     info.bankCardNum,
+                    info.money,
                     info.applyCount
                 FROM
                     difficult_help_info info
@@ -440,16 +475,44 @@ public class DifficultHelpReadingController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        pageParam.buildSearch(cnd, "info.");
+        pageParam.buildReadingSearch(cnd, "info.");
         cnd.groupBy("info.id");
         sql.setCondition(cnd);
         List<NutMap> list = difficultHelpCommonService.listMap(sql);
-        Sys_user user = sysUserService.fetch(SecurityUtil.getUserId());
 
         for (int i = 0; i < list.size(); i++) {
             list.get(i).put("index", (i + 1));
         }
 
+        String fileName = "困难慰问汇总表_" + DateUtil.format(new Date(), "yyyyMMdd");
+        if ("xlsx".equals(flag)) {
+            String[][] columns = {
+                    {"序号", "index"}, {"姓名", "userName"}, {"工号", "loginName"},
+                    {"性别", "sex"}, {"身份证号", "idCard"}, {"年龄", "age"},
+                    {"职务", "position"}, {"职称", "officialCapacity"}, {"所属单位", "unitName"},
+                    {"手机号码", "mobile"}, {"生活致困原因", "reason"}, {"级别", "level"},
+                    {"家庭年总收入", "homeIncome"}, {"家庭人数", "homeNumber"},
+                    {"困难类型", "subsidyStandards"}, {"开户行", "bankOfDeposit"},
+                    {"银行卡号", "bankCardNum"}, {"实际金额（元）", "money"}, {"申请次数", "applyCount"}
+            };
+            List<ExcelExportEntity> entities = new ArrayList<>();
+            for (String[] column : columns) {
+                entities.add(new ExcelExportEntity(column[0], column[1], 20));
+            }
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+            exportParams.setTitle("困难帮扶汇总表");
+            exportParams.setSheetName("汇总数据");
+            try (Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, list)) {
+                CommonDownloadUtil.download(fileName + ".xlsx", workbook, response);
+            } catch (Exception e) {
+                log.error("导出Excel汇总表失败", e);
+                throw new RuntimeException("导出Excel汇总表失败：" + e.getMessage(), e);
+            }
+            return;
+        }
+
+        Sys_user user = sysUserService.fetch(SecurityUtil.getUserId());
         result.put("schoolName", "中国地址大学（武汉）");
         result.put("year", DateUtil.format(new Date(), "yyyy"));
         result.put("applyTime", DateUtil.format(new Date(), "yyyy年MM月dd日"));
@@ -457,41 +520,19 @@ public class DifficultHelpReadingController {
         result.put("mobile", user.getMobile());
         result.put("da", list);
 
-        String resource;
-        if ("xlsx".equals(flag)) {
-            resource = "difficulty_summary_xlsx";
-            if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-                resource = "difficulty_summary_school_xlsx";
-            }
-        } else {
-            resource = "difficulty_summary";
-            if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-                resource = "difficulty_summary_school";
-            }
+        String resource = "difficulty_summary";
+        if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            resource = "difficulty_summary_school";
         }
 
-        String fileName = "困难慰问汇总表_" + DateUtil.format(new Date(), "yyyyMMdd");
-
-        if ("xlsx".equals(flag)) {
-            try {
-                InputStream is = sysOfficeTemplateUtil.getTemplate(resource);
-                TemplateExportParams exportParams = new TemplateExportParams(is, null);
-                Workbook workbook = ExcelExportUtil.exportExcel(exportParams, result);
-                CommonDownloadUtil.download(fileName + ".xlsx", workbook, response);
-            } catch (Exception e) {
-                log.error("导出Excel汇总表失败", e);
-                throw new RuntimeException("导出Excel汇总表失败：" + e.getMessage());
-            }
-        } else if ("docx".equals(flag)) {
-            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+        if ("docx".equals(flag)) {
+            try (InputStream input = sysOfficeTemplateUtil.getTemplate(resource)) {
                 Configure config = Configure.builder()
                         .bind("da", new LoopRowTableRenderPolicy())
                         .build();
 
-                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(resource), config)
-                        .render(result)
-                        .writeAndClose(out);
-                CommonDownloadUtil.download(fileName + ".docx", out.toByteArray(), response);
+                byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, result, config, false, "difficulthelp:summary:" + resource);
+                CommonDownloadUtil.download(fileName + ".docx", bytes, response);
             }
         }
     }

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSecondApprovalController.java

@@ -2,10 +2,12 @@ package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
+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.utils.PageUtil;
 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.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
@@ -14,6 +16,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -26,15 +29,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpBranchUnionApprovalController
+ * @name：DifficultHelpSecondApprovalController
  * @Date 2025/7/31 11:47
- * @注释
+ * @注释 困难帮扶二级审批
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助二级党组织审核")
+@ApiOperation("困难帮扶二级审批")
 @At("/platform/difficultHelp/unionLeaderApproval")
-public class DifficultHelpBranchUnionLeaderApprovalController {
+public class DifficultHelpSecondApprovalController {
 
     @Inject
     private Dao dao;
@@ -42,27 +45,27 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @SaCheckPermission("difficultHelp.secondApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @SaCheckPermission("difficultHelp.secondApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.unionLeaderApproval")
+    @SaCheckPermission("h5.difficultHelp.secondApproval")
     @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
     public void h5() {
     }
 
 
     @At
-    @ApiOperation("困难补助分工会审核列表")
-    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @ApiOperation("困难帮扶二级审批列表")
+    @SaCheckPermission("difficultHelp.secondApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -76,6 +79,7 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
                     info.subsidyStandards,
                     LEFT(info.applyTime, 10) AS applyTime,
                     info.applyCount,
+                    info.applyMoney,
                     info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
@@ -103,6 +107,14 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
+        cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
 //        pageParam.buildSearchUnit(cnd, "info.");
 
         if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) {
@@ -114,8 +126,10 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
         cnd.andEX("info.unionId", "=", pageParam.getUnionId());
         cnd.andEX("info.unitId", "=", pageParam.getUnitId());
 
-        cnd.and("t.taskName", "=", "36ebafda-44c2-4bd3-bd7f-10839a575a0d");
-        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.and("t.taskName", "=", "715ece82-4ae3-433c-ad18-ed875f45d1e3");
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) {
+            cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        }
 
         if (pageParam.getAudit()) {
             cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpThirdApprovalController.java

@@ -4,10 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
 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.utils.PageUtil;
 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.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
@@ -17,6 +19,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -30,15 +33,15 @@ import java.util.List;
 /**
  * @version 1.0
  * @Author zzr
- * @name：DifficultHelpSchoolUnionApprovalController
+ * @name：DifficultHelpThirdApprovalController
  * @Date 2025/7/31 11:47
- * @注释
+ * @注释 困难帮扶三级审批
  */
 @IocBean
 @Ok("json")
-@ApiOperation("困难补助校工会审核")
+@ApiOperation("困难帮扶三级审批")
 @At("/platform/difficultHelp/schoolUnionApproval")
-public class DifficultHelpSchoolUnionApprovalController {
+public class DifficultHelpThirdApprovalController {
 
     @Inject
     private Dao dao;
@@ -46,26 +49,26 @@ public class DifficultHelpSchoolUnionApprovalController {
     private DifficultHelpCommonService difficultHelpCommonService;
 
     @At("")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html")
     public void form() {
     }
 
     @At
-    @SaCheckPermission("h5.difficultHelp.schoolUnionApproval")
+    @SaCheckPermission("h5.difficultHelp.thirdApproval")
     @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html")
     public void h5() {
     }
 
     @At
-    @ApiOperation("困难补助校工会审核列表")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @ApiOperation("困难帮扶三级审批列表")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     public Result pageData(DifficultHelpPageParam pageParam) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -79,6 +82,8 @@ public class DifficultHelpSchoolUnionApprovalController {
                     info.subsidyStandards,
                     LEFT(info.applyTime, 10) AS applyTime,
                     info.applyCount,
+                    info.applyMoney,
+                    info.money,
                     info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
@@ -106,10 +111,39 @@ public class DifficultHelpSchoolUnionApprovalController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        pageParam.buildSearch(cnd, "info.");
+        cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+        pageParam.buildSearch(cnd, "info.", false);
 
-        cnd.and("t.taskName", "=", "715ece82-4ae3-433c-ad18-ed875f45d1e3");
-        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.and("t.taskName", "=", "e405f96c-5fc0-4f63-b323-e69dfe853253");
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            Sql unitSql = Sqls.queryString("""
+                    SELECT DISTINCT ur.unitId
+                    FROM sys_user_role ur
+                    INNER JOIN sys_role r ON r.id = ur.roleId
+                    WHERE ur.userId = @userId
+                      AND ur.enable = true
+                      AND r.disabled = false
+                      AND r.code = @roleCode
+                      AND ur.unitId IS NOT NULL
+                      AND ur.unitId <> ''
+                    """);
+            unitSql.setParam("userId", SecurityUtil.getUserId());
+            unitSql.setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name());
+            dao.execute(unitSql);
+            List<String> managedUnitIds = unitSql.getList(String.class);
+            if (managedUnitIds.isEmpty()) {
+                cnd.and(new Static("1 = 0"));
+            } else {
+                cnd.and("info.unitId", "in", managedUnitIds);
+            }
+        }
 
         if (pageParam.getAudit()) {
             cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
@@ -131,11 +165,10 @@ public class DifficultHelpSchoolUnionApprovalController {
 
     @At
     @ApiOperation("保存补助金额、级别")
-    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @SaCheckPermission("difficultHelp.thirdApproval")
     @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}")
     public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) {
-        dao.updateIgnoreNull(difficultHelpInfo);
-        return Result.success();
+        return Result.error("三级审批不再设置级别和帮扶金额，请在一级、二级审批中填写");
     }
 
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/interceptor/DifficultHelpSaveInterceptor.java

@@ -6,6 +6,7 @@ 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.staffbenefit.difficulthelp.models.DifficultHelpInfo;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -29,6 +30,7 @@ public class DifficultHelpSaveInterceptor implements FlowInterceptor {
 
         Dao dao = ServiceContext.find(Dao.class);
         DifficultHelpInfo difficultHelpInfo = Json.fromJson(DifficultHelpInfo.class, formDataStr);
+        ServiceContext.find(DifficultHelpCommonService.class).validateApplyUser(difficultHelpInfo);
         difficultHelpInfo.setApplyTime(new Date());
         dao.insertOrUpdate(difficultHelpInfo);
 

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/models/DifficultHelpInfo.java

@@ -194,6 +194,11 @@ public class DifficultHelpInfo extends BaseModel {
     @ColDefine(type = ColType.INT)
     private Integer applyCount;
 
+    @Column
+    @Comment("申请金额")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private Double applyMoney;
+
     @Column
     @Comment("补助金额")
     @ColDefine(type = ColType.VARCHAR, width = 200)

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java

@@ -19,6 +19,10 @@ import java.util.List;
  */
 public interface DifficultHelpCommonService extends BaseService<DifficultHelpInfo> {
 
+    void validateApplyUser(DifficultHelpInfo difficultHelpInfo);
+
+    void validateApplyUser(DifficultHelpInfo difficultHelpInfo, boolean requireApplyMoney);
+
     /**
      * 导入实际金额数据处理
      * @param file     文件

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java

@@ -4,6 +4,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.base.utils.ManyAddOrRenewUtil;
 import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_user;
@@ -50,6 +53,49 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
     @Inject
     private ManyAddOrRenewUtil manyAddOrRenewUtil;
 
+    @Override
+    public void validateApplyUser(DifficultHelpInfo difficultHelpInfo) {
+        validateApplyUser(difficultHelpInfo, true);
+    }
+
+    @Override
+    public void validateApplyUser(DifficultHelpInfo difficultHelpInfo, boolean requireApplyMoney) {
+        if (difficultHelpInfo == null || StrUtil.isBlank(difficultHelpInfo.getUserId())) {
+            throw new BaseException("请选择受助人");
+        }
+        if (StrUtil.isNotBlank(difficultHelpInfo.getId())) {
+            DifficultHelpInfo dbInfo = dao().fetch(DifficultHelpInfo.class, difficultHelpInfo.getId());
+            if (dbInfo != null && !SecurityUtil.getUserId().equals(dbInfo.getCreatedBy())) {
+                throw new BaseException("只能查看他人代为申请的记录，不能修改或提交");
+            }
+        }
+        if ((requireApplyMoney || difficultHelpInfo.getApplyMoney() != null)
+                && (difficultHelpInfo.getApplyMoney() == null || !Double.isFinite(difficultHelpInfo.getApplyMoney())
+                || difficultHelpInfo.getApplyMoney() <= 0)) {
+            throw new BaseException("请填写大于零的申请金额");
+        }
+        if (difficultHelpInfo.getUserId().equals(SecurityUtil.getUserId())) {
+            if (!AuthUtil.hasPermission("difficult_assistance_self")
+                    && !AuthUtil.hasPermission("difficult_assistance_school")
+                    && !AuthUtil.hasPermission("difficult_assistance_union")) {
+                throw new BaseException("没有帮扶申请权限");
+            }
+            return;
+        }
+        boolean schoolScope = AuthUtil.hasPermission("difficult_assistance_school");
+        if (!schoolScope && !AuthUtil.hasPermission("difficult_assistance_union")) {
+            throw new BaseException("没有代申请权限");
+        }
+        View_user recipient = dao().fetch(View_user.class, Cnd.where("id", "=", difficultHelpInfo.getUserId()));
+        if (recipient == null) {
+            throw new BaseException("受助人不存在");
+        }
+        if (!schoolScope && (StrUtil.isBlank(SecurityUtil.getUnionId())
+                || !SecurityUtil.getUnionId().equals(recipient.getUnionId()))) {
+            throw new BaseException("只能替本分工会人员申请");
+        }
+    }
+
     @Override
     public boolean hasAppliedInYear(String userId, Date applyTime, String excludeRecordId) {
         if (StrUtil.isBlank(userId) || applyTime == null) {
@@ -91,10 +137,7 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
 
         // 2. 查询符合条件的 DifficultHelpInfo 记录
         Cnd cnd = Cnd.NEW();
-        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
-            cnd.and(Cnd.exps("loginName", "LIKE", "%" + pageForm.getSearchKeyword() + "%")
-                    .or("userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"));
-        }
+        pageForm.buildReadingSearch(cnd, "");
         List<DifficultHelpInfo> infoList = dao().query(DifficultHelpInfo.class, cnd);
 
         // 3. 构建用户缴费索引 (userId -> year -> money)

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.lang.Lang;
 
 import java.util.List;
@@ -32,7 +33,34 @@ public class DifficultHelpPageParam extends PageForm {
 
     private List<String> dateRange;
 
+    public void buildReadingSearch(Cnd cnd, String prefix) {
+        buildSearch(cnd, prefix, false);
+        applyReadingScope(cnd, prefix);
+        String recordPrefix = StrUtil.isBlank(prefix) ? "difficult_help_info." : prefix;
+        cnd.and(new Static("EXISTS (SELECT 1 FROM wf_process_instance reading_instance WHERE reading_instance.businessNo = "
+                + recordPrefix + "id AND reading_instance.state = 20)"));
+    }
+
+    public void applyReadingScope(Cnd cnd, String prefix) {
+        if (AuthUtil.hasPermission("difficult_all_school")) {
+            return;
+        }
+        if (AuthUtil.hasPermission("difficult_branch_union") && StrUtil.isNotBlank(SecurityUtil.getUnionId())) {
+            cnd.and(prefix + "unionId", "=", SecurityUtil.getUnionId());
+            return;
+        }
+        if (AuthUtil.hasPermission("difficult_self") && StrUtil.isNotBlank(SecurityUtil.getUserId())) {
+            cnd.and(prefix + "userId", "=", SecurityUtil.getUserId());
+            return;
+        }
+        cnd.and("1", "=", 0);
+    }
+
     public void buildSearch(Cnd cnd, String prefix){
+        buildSearch(cnd, prefix, true);
+    }
+
+    public void buildSearch(Cnd cnd, String prefix, boolean restrictDataScope){
         if (cnd == null) {
             cnd = Cnd.NEW();
         }
@@ -46,7 +74,7 @@ public class DifficultHelpPageParam extends PageForm {
 
         cnd.andEX("YEAR(" + prefix + "applyTime)", "=", this.getYear());
 
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+        if (restrictDataScope && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {
                 cnd.and(prefix + "unionid", "=", SecurityUtil.getUnionId());
             } else {

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceApplyController.java

@@ -0,0 +1,252 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+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.utils.SysOfficeTemplateUtil;
+import com.budwk.app.flow.constant.FlowConst;
+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.sys.views.View_user;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+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.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.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceApplyController
+ * @Author JyuHsin
+ * @Date 2025/8/20 15:40
+ * @Version 1.0
+ * @Description TODO
+ */
+@SaCheckRole("BRANCH_UNION_CHAIRMAN")
+@IocBean
+@At("/platform/special_condolence/apply")
+@Api("特殊慰问申请")
+@Ok("json:full")
+public class SpecialCondolenceApplyController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private FlowEngine flowEngine;
+	@Inject
+	private SpecialCondolenceService specialcondolenceService;
+	@Inject
+	private FlowCommonService flowCommonService;
+	@Inject
+	private SysOfficeTemplateUtil sysOfficeTemplateUtil;
+
+	@At("/")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/apply/index.html")
+	@SaCheckPermission("special_condolence.apply")
+	public void index() {}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/specialcondolence/apply/index.html")
+	@SaCheckPermission("h5.special_condolence.apply")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("保存申请")
+	@SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+	@SLog(tag = "特殊慰问系统-慰问申请", msg = "保存申请")
+	public Result save(@Param("data") SpecialCondolence specialcondolence) {
+		if(StrUtil.isBlank(specialcondolence.getId())) specialcondolence.setCreateTime(DateUtil.now());
+		prepareApplication(specialcondolence);
+		specialcondolenceService.saveDraftApplication(specialcondolence);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("提交申请")
+	@SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+	@SLog(tag = "特殊慰问系统-慰问申请", msg = "提交申请")
+	@Aop(TransAop.READ_COMMITTED)
+	public Result submit(@Param("data") SpecialCondolence specialcondolence) {
+        if (StrUtil.isBlank(specialcondolence.getRemark()) || specialcondolence.getRemark().trim().length() > 500) throw new com.budwk.app.base.exception.BaseException("请填写500字以内的申请事由");
+        if (StrUtil.isBlank(specialcondolence.getSignature())) throw new com.budwk.app.base.exception.BaseException("请完成申请人签字");
+		if(StrUtil.isBlank(specialcondolence.getId())) specialcondolence.setCreateTime(DateUtil.now());
+		prepareApplication(specialcondolence);
+		specialcondolenceService.saveApplication(specialcondolence);
+		// 开启流程实例
+		Dict args = Dict.create();
+		args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+		args.set(FlowConst.FORM_DATA, specialcondolence);
+		ProcessInstance instance = flowEngine.startProcessInstanceByKey("TSWW", specialcondolence.getId(), SecurityUtil.getUserId(), args);
+
+		// 自动完成第一个申请任务
+		List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+		for (ProcessTask task : doingTaskList) {
+			flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+		}
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("重新提交申请")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+	public Result submitAgain(@Param("data") SpecialCondolence specialcondolence, @Param("taskId") Long taskId) {
+        if (StrUtil.isBlank(specialcondolence.getRemark()) || specialcondolence.getRemark().trim().length() > 500) throw new com.budwk.app.base.exception.BaseException("请填写500字以内的申请事由");
+        if (StrUtil.isBlank(specialcondolence.getSignature())) throw new com.budwk.app.base.exception.BaseException("请完成申请人签字");
+		ProcessTask task = taskId == null ? null : dao.fetch(ProcessTask.class, taskId);
+		ProcessInstance instance = task == null ? null : dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+		if (instance == null || !StrUtil.equals(instance.getBusinessNo(), specialcondolence.getId())
+				|| !"startTask".equals(task.getTaskName()) || !SecurityUtil.getUserId().equals(instance.getOperator())) {
+			throw new com.budwk.app.base.exception.BaseException("申请任务不匹配");
+		}
+		prepareApplication(specialcondolence);
+		specialcondolenceService.saveApplication(specialcondolence);
+
+		Dict dict = Dict.create();
+		dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+		dict.set(FlowConst.FORM_DATA, specialcondolence);
+		dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+		flowCommonService.executeTask(dict);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("查询用户")
+	@SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+	public Object listUser(String keyword) {
+		Sql sql = Sqls.create("""
+				select
+					u.id,
+					u.idCard,
+                    u.personType,
+					bank.bankOfDeposit,
+					bank.bankUserName,
+					bank.bankCardNumber,
+					username as userName,
+					loginname as loginName,
+					sex,
+					mobile,
+					technicalTitle,
+					IFNULL(unitname, '暂无') as unitName,
+					unitid as unitId,
+					unionid as unionId,
+					unionname as unionName
+				from
+					vw_user u
+                    LEFT JOIN (
+                        SELECT idCard, bankOfDeposit, bankUserName, bankCardNumber,
+                               ROW_NUMBER() OVER (PARTITION BY idCard ORDER BY createdAt DESC, id DESC) rn
+                        FROM special_condolence_recipient WHERE delFlag = false
+                    ) bank ON bank.idCard = u.idCard AND bank.rn = 1 AND u.idCard <> ''
+				$condition
+				""");
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(keyword)) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(View_user::getLoginname, "like", "%" + keyword + "%");
+			seg.or(View_user::getUsername, "like", "%" + keyword + "%");
+			cnd.and(seg);
+		}
+        if (StrUtil.isBlank(SecurityUtil.getUnionId())) throw new com.budwk.app.base.exception.BaseException("申请人未关联分工会");
+        cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
+		sql.setCondition(cnd);
+		Pagination pagination = specialcondolenceService.listPageMap(1, 50, sql);
+		return Result.success(pagination.getList());
+	}
+
+    @At
+    @Ok("void")
+    @SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+    public void importTemplate(javax.servlet.http.HttpServletResponse response) throws Exception {
+        String templateCode = "special_condolence_import";
+        try (java.io.InputStream input = sysOfficeTemplateUtil.getTemplate(templateCode)) {
+            com.budwk.app.base.utils.CommonDownloadUtil.download(
+                    sysOfficeTemplateUtil.getTemplateFileName(templateCode), input.readAllBytes(), response);
+        }
+    }
+
+    @At
+    @SaCheckPermission(value = {"special_condolence.apply", "h5.special_condolence.apply"}, mode = SaMode.OR)
+    @org.nutz.mvc.annotation.AdaptBy(type = org.nutz.mvc.upload.UploadAdaptor.class, args = {"ioc:fileUpload"})
+    public Result importRecipients(@Param("file") org.nutz.mvc.upload.TempFile file) throws Exception {
+        if (file == null) throw new com.budwk.app.base.exception.BaseException("请选择Excel文件");
+        if (!file.getSubmittedFileName().toLowerCase(java.util.Locale.ROOT).matches(".*\\.(xlsx|xls)$")) throw new com.budwk.app.base.exception.BaseException("仅支持xlsx、xls文件");
+        String[] headers = {"慰问对象", "工号", "身份证号码", "开户行", "户名", "收款账户"};
+        String[] fields = {"helpUserName", "helpLoginName", "idCard", "bankOfDeposit", "bankUserName", "bankCardNumber"};
+        java.util.List<cn.hutool.json.JSONObject> result = new java.util.ArrayList<>();
+        try (java.io.InputStream input = new java.io.FileInputStream(file.getFile());
+             org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(input)) {
+            if (workbook.getNumberOfSheets() == 0) throw new com.budwk.app.base.exception.BaseException("Excel中没有工作表");
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            org.apache.poi.ss.usermodel.DataFormatter formatter = new org.apache.poi.ss.usermodel.DataFormatter();
+            org.apache.poi.ss.usermodel.Row header = sheet.getRow(0);
+            for (int c = 0; c < headers.length; c++) {
+                if (header == null || !headers[c].equals(formatter.formatCellValue(header.getCell(c)).trim())) throw new com.budwk.app.base.exception.BaseException("表头不正确，请下载导入模板");
+            }
+            if (sheet.getLastRowNum() > 1000) throw new com.budwk.app.base.exception.BaseException("最多导入1000行");
+            for (int r = 1; r <= sheet.getLastRowNum(); r++) {
+                org.apache.poi.ss.usermodel.Row excelRow = sheet.getRow(r);
+                if (excelRow == null) continue;
+                String prefix = "慰问对象" + (result.size() + 1) + " ";
+                cn.hutool.json.JSONObject row = new cn.hutool.json.JSONObject();
+                boolean empty = true;
+                for (int c = 0; c < fields.length; c++) {
+                    org.apache.poi.ss.usermodel.Cell cell = excelRow.getCell(c);
+                    String value = formatter.formatCellValue(cell).trim();
+                    if (c != 1 && cell != null && cell.getCellType() == org.apache.poi.ss.usermodel.CellType.FORMULA) throw new com.budwk.app.base.exception.BaseException(prefix + "不支持公式，请填写实际值");
+                    if ((c == 2 || c == 5) && cell != null && cell.getCellType() == org.apache.poi.ss.usermodel.CellType.NUMERIC) throw new com.budwk.app.base.exception.BaseException(prefix + "工号、身份证和收款账户请使用文本格式，避免数字失真");
+                    row.set(fields[c], value);
+                    empty = empty && value.isEmpty();
+                }
+                if (empty) continue;
+                if (!com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceRecipients.validIdCard(row.getStr("idCard"))) throw new com.budwk.app.base.exception.BaseException(prefix + "身份证号码格式不正确");
+                if (!row.getStr("bankCardNumber").matches("[0-9]{6,30}")) throw new com.budwk.app.base.exception.BaseException(prefix + "收款账户格式不正确");
+                result.add(row);
+            }
+        }
+        if (result.isEmpty()) throw new com.budwk.app.base.exception.BaseException("没有可导入的数据");
+        return Result.success(result);
+    }
+
+	private void prepareApplication(SpecialCondolence info) {
+		if (StrUtil.isNotBlank(info.getId())) {
+			SpecialCondolence existing = dao.fetch(SpecialCondolence.class, info.getId());
+			if (existing == null || !SecurityUtil.getUserId().equals(existing.getCreatedBy())) {
+				throw new com.budwk.app.base.exception.BaseException("只能修改本人申请");
+			}
+			info.setCreatedBy(existing.getCreatedBy());
+		}
+		info.setApplyUserId(SecurityUtil.getUserId());
+		info.setApplyUserName(SecurityUtil.getUserUsername());
+		info.setApplyLoginName(SecurityUtil.getUserLoginname());
+		info.setApplyUnionId(SecurityUtil.getUnionId());
+		info.setApplyUnitId(SecurityUtil.getUnitId());
+	}
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceApprovalController.java

@@ -0,0 +1,60 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+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.json.Json;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@Ok("json")
+@At("/platform/special_condolence/approval")
+public class SpecialCondolenceApprovalController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At
+    @SaCheckLogin
+    @Aop(TransAop.READ_COMMITTED)
+    public Result executeTask(@Param("data") String data) {
+        Dict args = Json.fromJson(Dict.class, data);
+        if (args == null || args.getLong(FlowConst.PROCESS_TASK_ID_KEY) == null) {
+            throw new BaseException("审批任务不能为空");
+        }
+        ProcessTask task = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
+        if (task == null) throw new BaseException("审批任务不存在");
+        if (!"c438972e-2f67-4907-b229-cb7aa17da147".equals(task.getTaskName())
+                && !"7f560675-aeea-4254-a57e-957d03d6b786".equals(task.getTaskName())
+                && !"af363a4e-fc56-42a0-9906-8c7a2814006b".equals(task.getTaskName())) {
+            throw new BaseException("当前任务不是特殊慰问审批任务");
+        }
+        ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId());
+        com.budwk.app.flow.entity.ProcessDefine define = instance == null ? null : dao.fetch(com.budwk.app.flow.entity.ProcessDefine.class, instance.getProcessDefineId());
+        SpecialCondolence info = define == null || !"TSWW".equals(define.getName()) ? null : dao.fetch(SpecialCondolence.class, instance.getBusinessNo());
+        if (info == null) throw new BaseException("特殊慰问申请不存在");
+        if (StrUtil.isBlank(args.getStr("tf_sign"))) throw new BaseException("请完成审批签字");
+        if (StrUtil.isBlank(args.getStr("tf_opinion"))) throw new BaseException("请填写审批意见");
+
+        // 参与者权限由流程引擎校验，业务入口不接受客户端指定管理员代办。
+        args.remove(FlowConst.EXT_ENABLE_OPERATOR);
+        flowCommonService.executeTask(args);
+        return Result.success();
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceFourthApprovalController.java

@@ -0,0 +1,168 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+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.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.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
+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 java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceFourthApprovalController
+ * @Author JyuHsin
+ * @Date 2025/7/29 16:23
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/special_condolence/fourthApproval")
+@Api("特殊慰问四级审核")
+@Ok("json:full")
+public class SpecialCondolenceFourthApprovalController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private SpecialCondolenceService specialcondolenceService;
+
+	@At("/")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html")
+	@SaCheckPermission("special_condolence.fourthApproval")
+	public void index() {}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html")
+	@SaCheckPermission("h5.special_condolence.fourthApproval")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"special_condolence.fourthApproval", "h5.special_condolence.fourthApproval"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "unionId") String unionId,
+						   @Param(value = "unitId") String unitId,
+						   @Param(value = "approval") Boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  COALESCE(recipientTotals.recipientCount, 0) AS recipientCount,
+                  type.name as typeName,
+                  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,
+                  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 special_condolence info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN (
+                    SELECT applyId, COUNT(*) AS recipientCount
+                    FROM special_condolence_recipient
+                    WHERE delFlag = false
+                    GROUP BY applyId
+                  ) recipientTotals ON recipientTotals.applyId = info.id
+                  LEFT JOIN special_condolence_type type ON info.type = type.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("info.id", "is not", null);
+		cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(SpecialCondolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or(SpecialCondolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.andEX("info.type", "=", type);
+		cnd.andEX("YEAR(info.createTime)", "=", year);
+		cnd.andEX("info.applyUnionId", "=", unionId);
+		cnd.andEX("info.applyUnitId", "=", unitId);
+
+		cnd.and("t.taskName", "=", "af363a4e-fc56-42a0-9906-8c7a2814006b");
+        if (!"superadmin".equals(SecurityUtil.getUserLoginname()) && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            Sql unitSql = Sqls.queryString("""
+                    SELECT DISTINCT ur.unitId
+                    FROM sys_user_role ur
+                    INNER JOIN sys_role r ON r.id = ur.roleId
+                    WHERE ur.userId = @userId
+                      AND ur.enable = true
+                      AND r.disabled = false
+                      AND r.code = @roleCode
+                      AND ur.unitId IS NOT NULL
+                      AND ur.unitId <> ''
+                    """);
+            unitSql.setParam("userId", SecurityUtil.getUserId());
+            unitSql.setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name());
+            dao.execute(unitSql);
+            List<String> managedUnitIds = unitSql.getList(String.class);
+            if (managedUnitIds.isEmpty()) {
+                cnd.and(new Static("1 = 0"));
+            } else {
+                cnd.and("info.applyUnitId", "in", managedUnitIds);
+            }
+        }
+
+		if (approval) {
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+		} else {
+			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+		}
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("info.createTime");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		cnd.groupBy("t.id");
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = specialcondolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceMineController.java

@@ -0,0 +1,303 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+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.exception.BaseException;
+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.sms.SmsService;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.base.utils.SysOfficeTemplateUtil;
+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.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.vo.ProcessTaskVO;
+import com.budwk.app.sys.views.View_user;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceType;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+import com.deepoove.poi.data.PictureRenderData;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.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.Lang;
+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.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceApplyController
+ * @Author JyuHsin
+ * @Date 2025/7/28 11:06
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@At("/platform/special_condolence/mine")
+@Api("特殊慰问我的")
+@Ok("json:full")
+public class SpecialCondolenceMineController {
+
+	@Inject
+	private SpecialCondolenceService specialcondolenceService;
+	@Inject
+	private FlowEngine flowEngine;
+	@Inject
+	private SysOfficeTemplateUtil sysOfficeTemplateUtil;
+
+	@At("/")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/mine/index.html")
+	@SaCheckPermission("special_condolence.mine")
+	public void index() {}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/specialcondolence/mine/index.html")
+	@SaCheckPermission("h5.special_condolence.mine")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"special_condolence.mine", "h5.special_condolence.mine"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  COALESCE(recipientTotals.recipientCount, 0) AS recipientCount,
+                  type.name as typeName,
+                  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') AS startTaskId
+                FROM
+                  special_condolence info
+                  LEFT JOIN (
+                    SELECT applyId, COUNT(*) AS recipientCount
+                    FROM special_condolence_recipient
+                    WHERE delFlag = false
+                    GROUP BY applyId
+                  ) recipientTotals ON recipientTotals.applyId = info.id
+                  LEFT JOIN special_condolence_type type ON info.type = type.id
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN (
+                    SELECT
+                      id,
+                      processInstanceId,
+                      taskName,
+                      displayName,
+                      taskType,
+                      performType,
+                      taskState,
+                      finishTime,
+                      taskParentId,
+                      variable,
+                      ROW_NUMBER() OVER (PARTITION BY processInstanceId ORDER BY createdAt DESC, id DESC) AS rn
+                    FROM wf_process_task
+                    WHERE taskState = 10
+                  ) t ON t.processInstanceId = ins.id AND t.rn = 1
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(SpecialCondolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or(SpecialCondolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.andEX("year(info.createTime)", "=", year);
+		cnd.andEX("info.type", "=", type);
+		cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
+
+		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		} else {
+			cnd.desc("info.createTime");
+		}
+
+		sql.setCondition(cnd);
+		Pagination<NutMap> pagination = specialcondolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pagination);
+	}
+
+	@At
+	@Ok("void")
+	@ApiOperation("导出特殊慰问申请表")
+	@SaCheckPermission("special_condolence.mine")
+	public void doExportApply(String id, HttpServletResponse response, Boolean print) throws Exception {
+		log.info("[特殊慰问导出] 开始，applyId={}, userId={}, format={}", id, SecurityUtil.getUserId(), Boolean.TRUE.equals(print) ? "PDF" : "Word");
+		SpecialCondolence specialcondolence = specialcondolenceService.loadApplication(id);
+		if (specialcondolence == null) throw new BaseException("该条记录不存在");
+		if (!SecurityUtil.getUserId().equals(specialcondolence.getCreatedBy())) {
+			throw new BaseException("只能导出本人提交的申请");
+		}
+		ProcessInstance instance = specialcondolenceService.dao().fetch(ProcessInstance.class,
+				Cnd.where("businessNo", "=", id).desc("id"));
+		if (instance == null || !ProcessInstanceStateEnum.FINISHED.getCode().equals(instance.getState())) {
+			throw new BaseException("只能导出已完成的申请");
+		}
+		log.info("[特殊慰问导出] 流程已完成，applyId={}, instanceId={}, state={}, applicantSignPresent={}", id, instance.getId(), instance.getState(), StrUtil.isNotBlank(specialcondolence.getSignature()));
+		NutMap docData = Lang.obj2nutmap(specialcondolence);
+		docData.put("payUserName", StrUtil.nullToEmpty(specialcondolence.getBankUserName()));
+		SpecialCondolenceType type = specialcondolenceService.dao().fetch(SpecialCondolenceType.class, specialcondolence.getType());
+		docData.put("typeName", type == null ? "" : type.getName());
+		docData.put("signature", null);
+		if (StrUtil.isNotBlank(specialcondolence.getSignature())) {
+			PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, specialcondolence.getSignature());
+			if (signature == null) throw new BaseException("申请人签字图片读取失败");
+			docData.put("signature", signature);
+		}
+		fillApplyApprovals(docData, instance);
+		for (String field : List.of("signature", "secondApprovalSign", "thirdApprovalSign", "fourthApprovalSign")) {
+			Object value = docData.get(field);
+			log.info("[特殊慰问导出] 渲染前图片字段，applyId={}, instanceId={}, field={}, valueType={}", id, instance.getId(), field, value == null ? "null" : value.getClass().getName());
+		}
+		String fileName = "重庆工贸职业技术学院特殊慰问申请表_" + StrUtil.nullToEmpty(specialcondolence.getHelpUserName());
+		try (InputStream input = getClass().getResourceAsStream("/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc")) {
+			if (input == null) throw new BaseException("特殊慰问申请表模板不存在");
+			boolean pdf = Boolean.TRUE.equals(print);
+			com.aspose.words.Document template = new com.aspose.words.Document(input);
+			template.getRange().replace("职工慰问", "特殊慰问", new com.aspose.words.FindReplaceOptions());
+			com.aspose.words.NodeCollection rows = template.getChildNodes(com.aspose.words.NodeType.ROW, true);
+			for (int i = rows.getCount() - 1; i >= 0; i--) {
+				com.aspose.words.Node row = rows.get(i);
+				if (row.getText().contains("firstApproval") || row.getText().contains("分工会主席")) row.remove();
+			}
+			java.io.ByteArrayOutputStream templateOutput = new java.io.ByteArrayOutputStream();
+			template.save(templateOutput, com.aspose.words.SaveFormat.DOCX);
+			byte[] bytes;
+			if (specialcondolence.getRecipients() != null && !specialcondolence.getRecipients().isEmpty()) {
+				com.aspose.words.Document combined = null;
+				for (cn.hutool.json.JSONObject person : specialcondolence.getRecipients()) {
+					NutMap personData = new NutMap();
+					personData.putAll(docData);
+					personData.putAll(person);
+					personData.put("payUserName", person.getStr("bankUserName"));
+					byte[] rendered = sysOfficeTemplateUtil.renderTemplate(new java.io.ByteArrayInputStream(templateOutput.toByteArray()), personData, null, false, "specialcondolence:" + id);
+					com.aspose.words.Document part = new com.aspose.words.Document(new java.io.ByteArrayInputStream(rendered));
+					if (combined == null) combined = part;
+					else combined.appendDocument(part, com.aspose.words.ImportFormatMode.KEEP_SOURCE_FORMATTING);
+				}
+				java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream();
+				combined.save(output, pdf ? com.aspose.words.SaveFormat.PDF : com.aspose.words.SaveFormat.DOCX);
+				bytes = output.toByteArray();
+			} else {
+				bytes = sysOfficeTemplateUtil.renderTemplate(new java.io.ByteArrayInputStream(templateOutput.toByteArray()), docData, null, pdf, "specialcondolence:" + id);
+			}
+			log.info("[特殊慰问导出] 渲染完成，applyId={}, format={}, outputBytes={}", id, pdf ? "PDF" : "Word", bytes.length);
+			CommonDownloadUtil.download(fileName + (pdf ? ".pdf" : ".docx"), bytes, response);
+		} catch (Exception e) {
+			log.error("[特殊慰问导出] 模板渲染或文件输出失败，applyId={}, instanceId={}, format={}", id, instance.getId(), Boolean.TRUE.equals(print) ? "PDF" : "Word", e);
+			throw e;
+		}
+	}
+
+	private void fillApplyApprovals(NutMap docData, ProcessInstance instance) {
+		String[] taskKeys = {"c438972e-2f67-4907-b229-cb7aa17da147",
+				"7f560675-aeea-4254-a57e-957d03d6b786", "af363a4e-fc56-42a0-9906-8c7a2814006b"};
+		String[] fields = {"secondApproval", "thirdApproval", "fourthApproval"};
+		List<String> suffixes = List.of("Opinion", "Sign", "Year", "Month", "Day");
+		for (String field : fields) {
+			for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+		}
+		List<ProcessTask> tasks = specialcondolenceService.dao().query(ProcessTask.class,
+				Cnd.where("processInstanceId", "=", instance.getId()).asc("id"));
+		log.info("[特殊慰问导出] 查询审批记录，applyId={}, instanceId={}, taskCount={}, expectedTaskKeys={}", instance.getBusinessNo(), instance.getId(), tasks.size(), List.of(taskKeys));
+		for (ProcessTask task : tasks) {
+			ProcessTaskVO taskVO = flowEngine.processTaskService().findById(task.getId());
+			log.info("[特殊慰问导出] 审批记录，instanceId={}, taskId={}, taskKey={}, displayName={}, state={}, finishTime={}, isFirstTaskNode={}, matchedApproval={}", instance.getId(), task.getId(), task.getTaskName(), task.getDisplayName(), task.getTaskState(), task.getFinishTime(), taskVO.getExt() == null ? null : taskVO.getExt().get("isFirstTaskNode"), List.of(taskKeys).contains(task.getTaskName()));
+			if ("startTask".equals(task.getTaskName()) || (!List.of(taskKeys).contains(task.getTaskName())
+					&& taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+				log.info("[特殊慰问导出] 申请节点重置本轮审批字段，instanceId={}, taskId={}, taskKey={}", instance.getId(), task.getId(), task.getTaskName());
+				// 重新申请后，仅导出本轮审批记录。
+				for (String field : fields) {
+					for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
+				}
+				continue;
+			}
+			for (int i = 0; i < taskKeys.length; i++) {
+				if (!taskKeys[i].equals(task.getTaskName())) continue;
+				for (String suffix : suffixes) docData.put(fields[i] + suffix, "Sign".equals(suffix) ? null : "");
+				if (!ProcessTaskStateEnum.FINISHED.getCode().equals(task.getTaskState())) {
+					log.info("[特殊慰问导出] 跳过未完成审批，instanceId={}, taskId={}, field={}, state={}", instance.getId(), task.getId(), fields[i], task.getTaskState());
+					continue;
+				}
+				Dict data = taskVO.getExt() == null ? Dict.create() : taskVO.getTaskFormData();
+				log.info("[特殊慰问导出] 读取审批表单，instanceId={}, taskId={}, field={}, formKeys={}, signPresent={}, signReferenceLength={}", instance.getId(), task.getId(), fields[i], data.keySet(), StrUtil.isNotBlank(data.getStr("sign")), StrUtil.nullToEmpty(data.getStr("sign")).length());
+				if (StrUtil.isBlank(data.getStr("sign"))) log.warn("[特殊慰问导出] 已完成审批缺少签名字段，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i]);
+				docData.put(fields[i] + "Opinion", StrUtil.nullToEmpty(data.getStr("opinion")));
+				if (StrUtil.isNotBlank(data.getStr("sign"))) {
+					PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, data.getStr("sign"));
+					if (signature == null) throw new BaseException("审批签字图片读取失败");
+					docData.put(fields[i] + "Sign", signature);
+					log.info("[特殊慰问导出] 审批签名填充完成，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i] + "Sign");
+				}
+				docData.put(fields[i] + "Year", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy"));
+				docData.put(fields[i] + "Month", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "M"));
+				docData.put(fields[i] + "Day", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "d"));
+			}
+		}
+	}
+
+	@At
+	@ApiOperation("删除")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission(value = {"special_condolence.mine", "h5.special_condolence.mine"}, mode = SaMode.OR)
+	@SLog(tag = "特殊慰问系统-我的申请", msg = "删除特殊慰问")
+	public Result delete(@Param("id") String id) {
+		specialcondolenceService.deleteApplication(id);
+		flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("查询单个慰问申请信息")
+	@SaCheckPermission(value = {"special_condolence", "h5.special_condolence"}, mode = SaMode.OR)
+	public Result info(String id) {
+		SpecialCondolence specialcondolence = specialcondolenceService.loadApplication(id);
+		SpecialCondolenceType type = specialcondolenceService.dao().fetch(SpecialCondolenceType.class, Cnd.where(SpecialCondolenceType::getId, "=", specialcondolence.getType()));
+		NutMap nutMap = Lang.obj2nutmap(specialcondolence);
+		nutMap.put("typeName", type == null ? "" : type.getName());
+		return Result.success(nutMap);
+	}
+	@Inject
+	private SmsService smsService;
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceReadController.java

@@ -0,0 +1,180 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+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 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.CommonDownloadUtil;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.sys.param.SysMsgSummaryPageForm;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+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 org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceReadController
+ * @Author JyuHsin
+ * @Date 2025/7/29 16:25
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "特殊慰问阅览")
+@At("/platform/special_condolence/read")
+public class SpecialCondolenceReadController {
+
+	@Inject
+	private SpecialCondolenceService specialcondolenceService;
+
+	@At("")
+	@SaCheckPermission("special_condolence.read")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/read/index.html")
+	public void index() {
+	}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission("special_condolence.read")
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "unionId") String unionId,
+						   @Param(value = "unitId") String unitId) {
+		Sql sql = Sqls.create("""
+				SELECT
+					info.*,
+                    (SELECT COUNT(*) FROM special_condolence_recipient recipient WHERE recipient.applyId = info.id AND recipient.delFlag = false) AS recipientCount,
+					ins.id AS instanceId,
+					type.name as typeName,
+					ins.state instanceState,
+					ins.processDefineId instanceProcessDefineId,
+					t.displayName taskName
+				FROM
+					special_condolence info
+					LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+					LEFT JOIN (
+						SELECT
+							processInstanceId,
+							displayName,
+							createdAt,
+							ROW_NUMBER() OVER (PARTITION BY processInstanceId ORDER BY createdAt DESC) AS rn
+							FROM wf_process_task
+					) t ON t.processInstanceId = ins.id AND t.rn = 1
+					LEFT JOIN special_condolence_type type ON info.type = type.id
+				$condition
+				""");
+		Cnd cnd = Cnd.NEW();
+		cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
+		cnd.andEX("info.type", "=", type);
+		cnd.andEX("YEAR(info.createTime)", "=", year);
+		cnd.andEX("info.applyUnionId", "=", unionId);
+		cnd.andEX("info.applyUnitId", "=", unitId);
+
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("info.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("info.createTime");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = specialcondolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+
+	@At
+	@Ok("void")
+	@SaCheckPermission("special_condolence.read")
+	@ApiOperation("导出特殊慰问汇总表")
+	public void onExport(PageForm pageForm,
+						 @Param(value = "year") Integer year,
+						 @Param(value = "type") String type,
+						 @Param(value = "unionId") String unionId,
+						 @Param(value = "unitId") String unitId,
+						 HttpServletResponse response) {
+		//查询审核通过的数据
+		Sql sql = Sqls.create("""
+				select
+					con.subject,
+					case when recipient.id is null then con.helpUserName else recipient.helpUserName end as helpUserName,
+					case when recipient.id is null then con.helpLoginName else recipient.helpLoginName end as helpLoginName,
+					con.applyUserName,
+					con.helpUnionName,
+					con.helpUnitName,
+					case when recipient.id is null then type.name else recipient.typeName end as typeName,
+					case when recipient.id is null then con.money else recipient.money end as money,
+					con.remark
+				from
+					special_condolence con
+					left join special_condolence_recipient recipient on recipient.applyId = con.id and recipient.delFlag = false
+					left join wf_process_instance ins on ins.businessNo = con.id
+					left join special_condolence_type type on type.id = con.type
+				$condition
+				order by con.createTime desc, con.id, recipient.sortNum, recipient.id
+				""");
+		Cnd cnd = Cnd.NEW();
+		cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
+		cnd.andEX("con.type", "=", type);
+		cnd.andEX("YEAR(con.createTime)", "=", year);
+		cnd.andEX("con.applyUnionId", "=", unionId);
+		cnd.andEX("con.applyUnitId", "=", unitId);
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("con.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("con.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		sql.setCondition(cnd);
+		List<NutMap> list = specialcondolenceService.listMap(sql);
+
+		List<ExcelExportEntity> exportEntities = new ArrayList<>();
+        exportEntities.add(new ExcelExportEntity("事项", "subject", 30));
+		exportEntities.add(new ExcelExportEntity("慰问对象", "helpUserName", 20));
+		exportEntities.add(new ExcelExportEntity("慰问对象工号", "helpLoginName", 20));
+		exportEntities.add(new ExcelExportEntity("申请人", "applyUserName", 20));
+		exportEntities.add(new ExcelExportEntity("所在工会", "helpUnionName", 20));
+		exportEntities.add(new ExcelExportEntity("所在单位", "helpUnitName", 20));
+		exportEntities.add(new ExcelExportEntity("慰问类型", "typeName", 20));
+		exportEntities.add(new ExcelExportEntity("慰问金额", "money", 20));
+		exportEntities.add(new ExcelExportEntity("申请理由", "remark", 20));
+
+		ExportParams exportParams = new ExportParams();
+		exportParams.setType(ExcelType.XSSF);
+		Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
+		CommonDownloadUtil.download("申报人汇总.xlsx", workbook, response);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceSecondApprovalController.java

@@ -0,0 +1,140 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+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.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+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.dao.util.cri.Static;
+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 java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/12/23 14:13
+ * @description 校工会预审
+ */
+@IocBean
+@At("/platform/special_condolence/schoolPrincipalApproval")
+@Api("特殊慰问二级审核")
+@Ok("json:full")
+public class SpecialCondolenceSecondApprovalController {
+
+    @Inject
+    private SpecialCondolenceService specialcondolenceService;
+
+    @At("/")
+    @Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html")
+    @SaCheckPermission("special_condolence.secondApproval")
+    public void index() {}
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html")
+    @SaCheckPermission("h5.special_condolence.secondApproval")
+    public void h5Index() {}
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"special_condolence.secondApproval", "h5.special_condolence.secondApproval"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "year") Integer year,
+                           @Param(value = "type") String type,
+                           @Param(value = "unionId") String unionId,
+                           @Param(value = "unitId") String unitId,
+                           @Param(value = "approval") Boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  COALESCE(recipientTotals.recipientCount, 0) AS recipientCount,
+                  type.name as typeName,
+                  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,
+                  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 special_condolence info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN (
+                    SELECT applyId, COUNT(*) AS recipientCount
+                    FROM special_condolence_recipient
+                    WHERE delFlag = false
+                    GROUP BY applyId
+                  ) recipientTotals ON recipientTotals.applyId = info.id
+                  LEFT JOIN special_condolence_type type ON info.type = type.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("info.id", "is not", null);
+        cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or(SpecialCondolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or(SpecialCondolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        cnd.andEX("info.type", "=", type);
+        cnd.andEX("YEAR(info.createTime)", "=", year);
+        cnd.andEX("info.applyUnionId", "=", unionId);
+        cnd.andEX("info.applyUnitId", "=", unitId);
+
+        cnd.and("t.taskName", "=", "c438972e-2f67-4907-b229-cb7aa17da147");
+//        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = specialcondolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceThirdApprovalController.java

@@ -0,0 +1,144 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+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.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+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.dao.util.cri.Static;
+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 java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceThirdApprovalController
+ * @Author JyuHsin
+ * @Date 2025/7/29 16:23
+ * @Version 1.0
+ * @Description TODO
+ */
+@IocBean
+@At("/platform/special_condolence/schoolUnionApproval")
+@Api("特殊慰问三级审核")
+@Ok("json:full")
+public class SpecialCondolenceThirdApprovalController {
+
+	@Inject
+	private SpecialCondolenceService specialcondolenceService;
+
+	@At("/")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html")
+	@SaCheckPermission("special_condolence.thirdApproval")
+	public void index() {}
+
+	@At("/h5")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/specialcondolence/schoolUnionApproval/index.html")
+	@SaCheckPermission("h5.special_condolence.thirdApproval")
+	public void h5Index() {}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission(value = {"special_condolence.thirdApproval", "h5.special_condolence.thirdApproval"}, mode = SaMode.OR)
+	public Result pageData(PageForm pageForm,
+						   @Param(value = "year") Integer year,
+						   @Param(value = "type") String type,
+						   @Param(value = "unionId") String unionId,
+						   @Param(value = "unitId") String unitId,
+						   @Param(value = "approval") Boolean approval) {
+		Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  COALESCE(recipientTotals.recipientCount, 0) AS recipientCount,
+                  type.name as typeName,
+                  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,
+                  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 special_condolence info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN (
+                    SELECT applyId, COUNT(*) AS recipientCount
+                    FROM special_condolence_recipient
+                    WHERE delFlag = false
+                    GROUP BY applyId
+                  ) recipientTotals ON recipientTotals.applyId = info.id
+                  LEFT JOIN special_condolence_type type ON info.type = type.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("info.id", "is not", null);
+		cnd.and(new Static("""
+                NOT EXISTS (
+                    SELECT 1 FROM wf_process_task newer
+                    WHERE newer.processInstanceId = t.processInstanceId
+                      AND newer.taskName = t.taskName
+                      AND newer.id > t.id
+                )
+                """));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(SpecialCondolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or(SpecialCondolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.andEX("info.type", "=", type);
+		cnd.andEX("YEAR(info.createTime)", "=", year);
+		cnd.andEX("info.applyUnionId", "=", unionId);
+		cnd.andEX("info.applyUnitId", "=", unitId);
+
+		cnd.and("t.taskName", "=", "7f560675-aeea-4254-a57e-957d03d6b786");
+		if (!"superadmin".equals(SecurityUtil.getUserLoginname())) {
+			cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+		}
+
+		if (approval) {
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+		} else {
+			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+		}
+
+		if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+			cnd.desc("info.createTime");
+		} else {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		}
+		cnd.groupBy("t.id");
+		sql.setCondition(cnd);
+		Pagination<NutMap> pageVO = specialcondolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		return Result.success(pageVO);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceTypeController.java

@@ -0,0 +1,91 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.controller;
+
+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.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceType;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+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 java.util.List;
+
+/**
+ * @ClassName SpecialCondolenceTypeController
+ * @Author JyuHsin
+ * @Date 2025/7/29 10:00
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@Api(tags = "特殊慰问类型")
+@At("/platform/special_condolence/type")
+public class SpecialCondolenceTypeController {
+
+	@Inject
+	private Dao dao;
+	@Inject
+	private SpecialCondolenceTypeService typeService;
+
+	@At("")
+	@SaCheckPermission("special_condolence.type")
+	@Ok("beetl:/platform/zhgh/staffbenefit/specialcondolence/type/index.html")
+	public void index() {
+	}
+
+	@At
+	@ApiOperation("分页查询")
+	@SaCheckPermission("special_condolence.type")
+	public Result pageData(PageForm pageForm) {
+		Cnd cnd = Cnd.NEW();
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or(SpecialCondolenceType::getName, "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or(SpecialCondolenceType::getCode, "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		cnd.asc("code");
+		Pagination pagination = typeService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
+		return Result.success(pagination);
+	}
+
+	@At
+	@ApiOperation("新增/修改特殊慰问类型")
+	@SaCheckPermission("special_condolence.type")
+	@SLog(tag = "特殊慰问系统-慰问类型", msg = "新增/修改特殊慰问类型")
+	public Object onSubmit(SpecialCondolenceType type) {
+		typeService.insertOrUpdate(type);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("删除特殊慰问类型")
+	@SaCheckPermission("special_condolence.type")
+	@SLog(tag = "特殊慰问系统-慰问类型", msg = "删除特殊慰问类型")
+	public Object onDelete(String id) {
+		typeService.delete(id);
+		return Result.success();
+	}
+
+	@At
+	@ApiOperation("查询特殊慰问类型")
+	@SaCheckLogin
+	public Result querySpecialCondolenceType() {
+		List<SpecialCondolenceType> list = typeService.query(Cnd.where(SpecialCondolenceType::getEnable, "=", true).asc(SpecialCondolenceType::getCode));
+		return Result.success(list);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/interceptor/SpecialCondolenceSaveInterceptor.java

@@ -0,0 +1,46 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.interceptor;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+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.dayofficework.article.models.Article;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.json.Json;
+
+/**
+ * @ClassName SpecialCondolenceSaveInterceptor
+ * @Author JyuHsin
+ * @Date 2025/7/28 11:01
+ * @Version 1.0
+ * @Description TODO
+ */
+public class SpecialCondolenceSaveInterceptor implements FlowInterceptor {
+
+	@Override
+	public void intercept(Execution execution) {
+		if (!com.budwk.app.web.commons.auth.utils.AuthUtil.hasRoleOr("BRANCH_UNION_CHAIRMAN")) {
+			throw new com.budwk.app.base.exception.BaseException("仅分工会主席可发起特殊慰问申请");
+		}
+		String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
+		SpecialCondolence specialcondolence = Json.fromJson(SpecialCondolence.class, formDataStr);
+
+		if(StrUtil.isBlank(specialcondolence.getId())) specialcondolence.setCreateTime(DateUtil.now());
+
+		Dao dao = ServiceContext.find(Dao.class);
+		ServiceContext.find(com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService.class).saveApplication(specialcondolence);
+
+		// 设置流程变量
+		execution.getArgs().set("origin", specialcondolence.getOrigin());
+
+		int instanceId = execution.getArgs().getInt(FlowConst.PROCESS_INSTANCE_ID_KEY);
+		dao.update(ProcessInstance.class, Chain.make("businessNo", specialcondolence.getId()), Cnd.where(ProcessInstance::getId, "=", instanceId));
+
+	}
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolence.java

@@ -0,0 +1,310 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.model;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import com.budwk.app.sys.models.Sys_file;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * @ClassName SpecialCondolence
+ * @Author JyuHsin
+ * @Date 2025/7/28 11:03
+ * @Version 1.0
+ * @Description TODO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("special_condolence")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("特殊慰问")
+public class SpecialCondolence extends BaseModel {
+
+	@Name
+	@Comment("ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@PrevInsert(uu32 = true)
+	private String id;
+
+    @Column
+    @Comment("事项")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String subject;
+
+
+	@Column
+	@Comment("申请人ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String applyUserId;
+
+	@Column
+	@Comment("申请人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String applyUserName;
+
+	@Column
+	@Comment("申请人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 120)
+	private String applyLoginName;
+
+	@Column
+	@Comment("申请人分工会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String applyUnionId;
+
+	@Column
+	@Comment("申请人分工会")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String applyUnionName;
+
+	@Column
+	@Comment("申请人单位ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String applyUnitId;
+
+	@Column
+	@Comment("申请人单位")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String applyUnitName;
+
+	@Column
+	@Comment("补助人ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String helpUserId;
+
+	@Column
+	@Comment("补助人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String helpUserName;
+
+	@Column
+	@Comment("补助人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 120)
+	private String helpLoginName;
+
+	@Column
+	@Comment("补助人分工会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String helpUnionId;
+
+	@Column
+	@Comment("补助人分工会")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String helpUnionName;
+
+	@Column
+	@Comment("补助人单位ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String helpUnitId;
+
+	@Column
+	@Comment("补助人单位")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String helpUnitName;
+
+	@Column
+	@Comment("类型")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String origin;
+
+	@Column
+	@Comment("收款人")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String payUserId;
+
+	@Column
+	@Comment("收款人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String payUserName;
+
+	@Column
+	@Comment("收款人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String payLoginName;
+
+	@Column
+	@Comment("慰问类型")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String type;
+
+	@Column
+	@Comment("慰问编码")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String typeCode;
+
+	@Column
+	@Comment("慰问方式")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String way;
+
+    @Column
+    @Comment("统一每人慰问金额")
+    @ColDefine(customType = "decimal(10,2)")
+    private java.math.BigDecimal perMoney;
+
+	@Column
+	@Comment("慰问金额")
+	@ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+	private Double money;
+
+	@Column
+	@Comment("发生时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String occurTime;
+
+	@Column
+	@Comment("生育几孩（孩次）")
+	@ColDefine(type = ColType.VARCHAR, width = 10)
+	private String child;
+
+	@Column
+	@Comment("所在医院")
+	@ColDefine(type = ColType.VARCHAR, width = 50)
+	private String hospital;
+
+	@Column
+	@Comment("病房床号")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String hospitalHouseNum;
+
+	@Column
+	@Comment("病房床号")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String hospitalHouseBedNum;
+
+	@Column
+	@Comment("住院病由")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String hospitalBy;
+
+	@Column
+	@Comment("备注")
+	@ColDefine(type = ColType.VARCHAR, width = 500)
+	private String remark;
+
+	@Column
+	@Comment("附件")
+	@ColDefine(type = ColType.MYSQL_JSON)
+	private List<JSONObject> files;
+
+	@Comment("签字")
+	@ColDefine(type = ColType.VARCHAR, width = 255)
+	@Column(hump = true)
+	private String signature;
+
+	@Column
+	@Comment("申请时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String createTime;
+
+
+
+
+	@Column
+	@Comment("户名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String bankUserName;
+
+	@Column
+	@Comment("银行账号")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String bankCardNumber;
+
+	@Column
+	@Comment("开户行")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String bankOfDeposit;
+
+	@Column
+	@Comment("证明人ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String certifierUserId;
+
+	@Column
+	@Comment("证明人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String certifierUserName;
+
+	@Column
+	@Comment("证明人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 120)
+	private String certifierLoginName;
+
+	@Column
+	@Comment("证明人分工会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String certifierUnionId;
+
+	@Column
+	@Comment("证明人分工会")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String certifierUnionName;
+
+	@Column
+	@Comment("证明人单位ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String certifierUnitId;
+
+	@Column
+	@Comment("证明人单位")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String certifierUnitName;
+
+	@Column
+	@Comment("经办人ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUserId;
+
+	@Column
+	@Comment("经办人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUserName;
+
+	@Column
+	@Comment("经办人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 120)
+	private String handlerLoginName;
+
+	@Column
+	@Comment("经办人分工会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUnionId;
+
+	@Column
+	@Comment("经办人分工会")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUnionName;
+
+	@Column
+	@Comment("经办人单位ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUnitId;
+
+	@Column
+	@Comment("经办人单位")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUnitName;
+
+	@Column
+	@Comment("入院时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String hospitalizationTime;
+
+	@Column
+	@Comment("出院时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String leaveHospitalTime;
+
+	@Column
+	@Comment("当年第几次住院")
+	@ColDefine(type = ColType.INT)
+	private Integer thisYearHospitalizationNum;
+
+	@Comment("慰问对象明细，由明细表加载")
+	private List<JSONObject> recipients;
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolenceRecipient.java

@@ -0,0 +1,100 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.model;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("special_condolence_recipient")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@TableIndexes({@Index(name = "idx_special_condolence_recipient_apply", fields = {"applyId"}, unique = false)})
+@Comment("特殊慰问被申请人明细")
+public class SpecialCondolenceRecipient extends BaseModel {
+    @Name
+    @PrevInsert(uu32 = true)
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+    @Column
+    @Comment("申请ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String applyId;
+
+    @Column
+    @Comment("慰问对象用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String helpUserId;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String personType;
+
+    @Column
+    @Comment("慰问对象工号")
+    @ColDefine(type = ColType.VARCHAR, width = 120)
+    private String helpLoginName;
+
+    @Column
+    @Comment("慰问对象")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String helpUserName;
+
+    @Column
+    @Comment("慰问类型ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String type;
+
+    @Column
+    @Comment("慰问类型名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String typeName;
+
+    @Column
+    @Comment("慰问类型编码")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String typeCode;
+
+    @Column
+    @Comment("慰问方式")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String way;
+
+    @Column
+    @Comment("身份证号码")
+    @ColDefine(type = ColType.VARCHAR, width = 18)
+    private String idCard;
+
+    @Column
+    @Comment("开户行")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String bankOfDeposit;
+
+    @Column
+    @Comment("户名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String bankUserName;
+
+    @Column
+    @Comment("收款账户")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String bankCardNumber;
+
+    @Column
+    @Comment("慰问金额")
+    @ColDefine(customType = "decimal(10,2)")
+    private java.math.BigDecimal money;
+
+    @Column
+    @Comment("慰问时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String occurTime;
+
+    @Column
+    @Comment("行序号")
+    @ColDefine(type = ColType.INT)
+    private Integer sortNum;
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolenceType.java

@@ -0,0 +1,84 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.model;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.DB;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @ClassName SpecialCondolenceType
+ * @Author JyuHsin
+ * @Date 2025/7/29 9:59
+ * @Version 1.0
+ * @Description TODO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("special_condolence_type")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("特殊慰问类型")
+public class SpecialCondolenceType extends BaseModel {
+
+	@Name
+	@Comment("ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@PrevInsert(uu32 = true)
+	private String id;
+
+	@Column
+	@Comment("编码")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String code;
+
+	@Column
+	@Comment("名称")
+	@ColDefine(type = ColType.VARCHAR, width = 50)
+	private String name;
+
+	@Column
+	@Comment("费用")
+	@ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+	private Double money;
+
+	@Column
+	@Comment("慰问方式")
+	@ColDefine(type = ColType.VARCHAR, width = 20)
+	private String way;
+
+	@Column
+	@Comment("是否启用")
+	@ColDefine(type = ColType.BOOLEAN)
+	@Default("1")
+	private Boolean enable;
+
+	@Column
+	@Comment("是否上传附件")
+	@ColDefine(type = ColType.BOOLEAN)
+	private Boolean isUploadFile;
+
+	@Column
+	@Comment("上传附件说明")
+	@ColDefine(type = ColType.VARCHAR,width = 50)
+	private String uploadFileDesc;
+
+	@Column
+	@Comment("排序字段")
+	@Prev({
+			@SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM special_condolence_type"),
+			@SQL(db = DB.ORACLE, value = "SELECT COALESCE(MAX(location),0)+1 FROM special_condolence_type")
+	})
+	private Integer location;
+
+	@Column
+	@Comment("排序")
+	@ColDefine(type = ColType.INT)
+	private int sortNum;
+
+	@Column
+	@Comment("上传会议纪要")
+	@Default("0")
+	@ColDefine(type = ColType.BOOLEAN)
+	private Boolean uploadMeetingRecord;
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceRecipients.java

@@ -0,0 +1,122 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.service;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.exception.BaseException;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceType;
+import org.nutz.dao.Dao;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+public final class SpecialCondolenceRecipients {
+    private SpecialCondolenceRecipients() {}
+
+    public static void prepare(SpecialCondolence info, Dao dao) {
+        if (info.getSubject() == null || info.getSubject().trim().isEmpty() || info.getSubject().trim().length() > 200) throw new BaseException("请填写200字以内的事项");
+        info.setSubject(info.getSubject().trim());
+        List<JSONObject> rows = info.getRecipients();
+        if (rows == null || rows.isEmpty()) throw new BaseException("请添加慰问对象");
+        if (rows.size() > 1000) throw new BaseException("每次申请最多1000人");
+        if (info.getFiles() != null && info.getFiles().size() > 5) throw new BaseException("最多上传5个附件");
+        if (info.getRemark() != null && info.getRemark().trim().length() > 500) throw new BaseException("申请事由最多500字");
+        if (info.getPerMoney() == null || info.getPerMoney().signum() <= 0 || info.getPerMoney().compareTo(new BigDecimal("10000")) > 0 || info.getPerMoney().scale() > 2) throw new BaseException("每人慰问金额须大于0且不超过10000元，最多两位小数");
+        try { LocalDate.parse(info.getOccurTime()); }
+        catch (Exception e) { throw new BaseException("请选择有效的统一慰问时间"); }
+        BigDecimal total = BigDecimal.ZERO;
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.get(i);
+            String prefix = "第" + (i + 1) + "行：";
+            if (row == null) throw new BaseException(prefix + "明细不能为空");
+            row.set("type", info.getType());
+            row.set("money", info.getPerMoney().toPlainString());
+            row.set("occurTime", info.getOccurTime());
+            if (cn.hutool.core.util.StrUtil.isNotBlank(row.getStr("helpUserId"))) resolveUser(row, dao, prefix);
+            String[] fields = {"helpUserName", "type", "idCard", "bankOfDeposit", "bankUserName", "bankCardNumber", "money", "occurTime"};
+            for (String field : fields) {
+                String value = row.getStr(field);
+                if (value == null || value.trim().isEmpty()) throw new BaseException(prefix + "请填写完整的慰问对象信息");
+                row.set(field, value.trim());
+            }
+            if (!validIdCard(row.getStr("idCard"))) throw new BaseException(prefix + "身份证号码不正确");
+            if (!row.getStr("bankCardNumber").matches("[0-9]{6,30}")) throw new BaseException(prefix + "收款账户须为6至30位数字");
+            if (row.getStr("helpUserName").length() > 100 || row.getStr("bankOfDeposit").length() > 100 || row.getStr("bankUserName").length() > 100) throw new BaseException(prefix + "姓名、开户行、户名不能超过100字");
+            if (!row.getStr("money").matches("[0-9]+(\\.[0-9]{1,2})?")) throw new BaseException(prefix + "金额最多两位小数");
+            BigDecimal money = new BigDecimal(row.getStr("money"));
+            if (money.signum() <= 0 || money.compareTo(new BigDecimal("10000")) > 0) throw new BaseException(prefix + "金额须大于0且不超过10000元");
+            try { LocalDate.parse(row.getStr("occurTime")); }
+            catch (Exception e) { throw new BaseException(prefix + "慰问时间格式须为yyyy-MM-dd"); }
+            SpecialCondolenceType type = dao.fetch(SpecialCondolenceType.class, row.getStr("type"));
+            if (type == null || !Boolean.TRUE.equals(type.getEnable())) throw new BaseException(prefix + "慰问类型不存在或已停用");
+            row.set("typeName", type.getName());
+            row.set("typeCode", type.getCode());
+            row.set("way", type.getWay());
+            if (Boolean.TRUE.equals(type.getIsUploadFile()) && (info.getFiles() == null || info.getFiles().isEmpty())) throw new BaseException(prefix + "该慰问类型需要上传附件");
+            total = total.add(money);
+        }
+        JSONObject first = rows.get(0);
+        String name = first.getStr("helpUserName");
+        info.setHelpUserName((rows.size() > 1 && name.length() > 90 ? name.substring(0, 90) : name) + (rows.size() > 1 ? "等" + rows.size() + "人" : ""));
+        info.setHelpUnitId(info.getApplyUnitId());
+        info.setHelpUnitName(info.getApplyUnitName());
+        info.setHelpUnionId(info.getApplyUnionId());
+        info.setHelpUnionName(info.getApplyUnionName());
+        info.setType(first.getStr("type"));
+        info.setTypeCode(first.getStr("typeCode"));
+        info.setWay(first.getStr("way"));
+        info.setOccurTime(first.getStr("occurTime"));
+        info.setMoney(total.doubleValue());
+        info.setBankOfDeposit(first.getStr("bankOfDeposit"));
+        info.setBankUserName(first.getStr("bankUserName"));
+        info.setBankCardNumber(first.getStr("bankCardNumber"));
+    }
+
+    public static void resolveUser(JSONObject row, Dao dao, String prefix) {
+        String userId = row.getStr("helpUserId");
+        com.budwk.app.sys.views.View_user user;
+        String unionId = com.budwk.app.web.commons.auth.utils.SecurityUtil.getUnionId();
+        if (cn.hutool.core.util.StrUtil.isBlank(unionId)) throw new BaseException(prefix + "申请人未关联分工会");
+        if (cn.hutool.core.util.StrUtil.isNotBlank(userId)) {
+            user = dao.fetch(com.budwk.app.sys.views.View_user.class, org.nutz.dao.Cnd.where("id", "=", userId));
+        } else {
+            java.util.List<com.budwk.app.sys.views.View_user> users = dao.query(com.budwk.app.sys.views.View_user.class,
+                    org.nutz.dao.Cnd.where("idCard", "=", row.getStr("idCard"))
+                            .and("username", "=", row.getStr("helpUserName")));
+            if (users.isEmpty()) throw new BaseException(prefix + "姓名、身份证与人员档案不匹配");
+            java.util.List<com.budwk.app.sys.views.View_user> members = users.stream()
+                    .filter(member -> java.util.Objects.equals(member.getUnionId(), unionId))
+                    .collect(java.util.stream.Collectors.toList());
+            if (members.isEmpty()) throw new BaseException(prefix + "只能选择申请人本工会人员");
+            String loginName = row.getStr("helpLoginName");
+            if (cn.hutool.core.util.StrUtil.isNotBlank(loginName)) {
+                members = members.stream().filter(member -> "劳务派遣人员".equals(member.getPersonType())
+                        || java.util.Objects.equals(member.getLoginname(), loginName))
+                        .collect(java.util.stream.Collectors.toList());
+            }
+            if (members.isEmpty()) throw new BaseException(prefix + "工号与慰问对象不一致");
+            if (members.size() > 1) throw new BaseException(prefix + "人员身份重复，请核对档案");
+            user = members.get(0);
+        }
+        if (user == null) throw new BaseException(prefix + "慰问对象不存在");
+        if (!java.util.Objects.equals(user.getUnionId(), unionId)) throw new BaseException(prefix + "只能选择申请人本工会人员");
+        if (!"劳务派遣人员".equals(user.getPersonType()) && cn.hutool.core.util.StrUtil.isBlank(row.getStr("helpLoginName"))) throw new BaseException(prefix + "普通人员必须填写工号");
+        if (!"劳务派遣人员".equals(user.getPersonType()) && (cn.hutool.core.util.StrUtil.isBlank(row.getStr("helpLoginName")) || !java.util.Objects.equals(user.getLoginname(), row.getStr("helpLoginName")))) throw new BaseException(prefix + "工号与慰问对象不一致");
+        if (cn.hutool.core.util.StrUtil.isNotBlank(user.getIdCard()) && !user.getIdCard().equalsIgnoreCase(row.getStr("idCard"))) throw new BaseException(prefix + "身份证号码与所选人员不一致");
+        row.set("helpUserId", user.getId());
+        row.set("helpLoginName", user.getLoginname());
+        row.set("personType", user.getPersonType());
+        row.set("helpUserName", user.getUsername());
+    }
+
+    public static boolean validIdCard(String value) {
+        if (value == null || !value.matches("[1-9][0-9]{16}[0-9Xx]")) return false;
+        try { LocalDate.parse(value.substring(6, 14), java.time.format.DateTimeFormatter.BASIC_ISO_DATE); }
+        catch (Exception e) { return false; }
+        int[] weights = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2};
+        int sum = 0;
+        for (int i = 0; i < weights.length; i++) sum += (value.charAt(i) - '0') * weights[i];
+        return "10X98765432".charAt(sum % 11) == Character.toUpperCase(value.charAt(17));
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceService.java

@@ -0,0 +1,18 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+
+/**
+ * @ClassName SpecialCondolenceService
+ * @Author JyuHsin
+ * @Date 2025/7/29 11:21
+ * @Version 1.0
+ * @Description TODO
+ */
+public interface SpecialCondolenceService extends BaseService<SpecialCondolence> {
+    void saveApplication(SpecialCondolence info);
+    void saveDraftApplication(SpecialCondolence info);
+    SpecialCondolence loadApplication(String id);
+    void deleteApplication(String id);
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceTypeService.java

@@ -0,0 +1,14 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceType;
+
+/**
+ * @ClassName SpecialCondolenceTypeService
+ * @Author JyuHsin
+ * @Date 2025/7/29 10:03
+ * @Version 1.0
+ * @Description TODO
+ */
+public interface SpecialCondolenceTypeService extends BaseService<SpecialCondolenceType> {
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/impl/SpecialCondolenceServiceImpl.java

@@ -0,0 +1,110 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.service.impl;
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceRecipient;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceRecipients;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.ArrayList;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolence;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @ClassName SpecialCondolenceServiceImpl
+ * @Author JyuHsin
+ * @Date 2025/7/29 11:22
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean(args = {"refer:dao"})
+public class SpecialCondolenceServiceImpl extends BaseServiceImpl<SpecialCondolence> implements SpecialCondolenceService {
+
+	public SpecialCondolenceServiceImpl(Dao dao) {
+		super(dao);
+	}
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void saveApplication(SpecialCondolence info) {
+        SpecialCondolenceRecipients.prepare(info, dao());
+        persistApplication(info);
+    }
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void saveDraftApplication(SpecialCondolence info) {
+        if (info.getRecipients() == null) info.setRecipients(new ArrayList<>());
+        info.getRecipients().removeIf(row -> row == null || java.util.stream.Stream.of(
+                "helpUserId", "helpUserName", "helpLoginName", "idCard", "bankOfDeposit", "bankUserName", "bankCardNumber")
+                .allMatch(field -> StrUtil.isBlank(row.getStr(field))));
+        for (JSONObject row : info.getRecipients()) {
+            row.set("type", info.getType());
+            row.set("typeCode", info.getTypeCode());
+            row.set("way", info.getWay());
+            row.set("money", info.getPerMoney());
+            row.set("occurTime", info.getOccurTime());
+        }
+        info.setMoney(info.getPerMoney() == null ? null : info.getPerMoney().multiply(BigDecimal.valueOf(info.getRecipients().size())).doubleValue());
+        persistApplication(info);
+    }
+
+    private void persistApplication(SpecialCondolence info) {
+        dao().insertOrUpdate(info);
+        dao().clear(SpecialCondolenceRecipient.class,
+                Cnd.where("applyId", "=", info.getId()));
+        int sort = 0;
+        for (JSONObject row : info.getRecipients()) {
+            SpecialCondolenceRecipient person = new SpecialCondolenceRecipient();
+            person.setApplyId(info.getId());
+            person.setHelpUserName(row.getStr("helpUserName", ""));
+            person.setHelpUserId(row.getStr("helpUserId", ""));
+            person.setHelpLoginName(row.getStr("helpLoginName"));
+            person.setPersonType(row.getStr("personType"));
+            person.setType(row.getStr("type", ""));
+            person.setTypeName(row.getStr("typeName"));
+            person.setTypeCode(row.getStr("typeCode"));
+            person.setWay(row.getStr("way"));
+            person.setIdCard(row.getStr("idCard", ""));
+            person.setBankOfDeposit(row.getStr("bankOfDeposit", ""));
+            person.setBankUserName(row.getStr("bankUserName", ""));
+            person.setBankCardNumber(row.getStr("bankCardNumber", ""));
+            person.setMoney(row.getBigDecimal("money", BigDecimal.ZERO));
+            person.setOccurTime(row.getStr("occurTime", ""));
+            person.setSortNum(sort++);
+            dao().insert(person);
+        }
+    }
+
+    @Override
+    public SpecialCondolence loadApplication(String id) {
+        SpecialCondolence info = fetch(id);
+        if (info != null) {
+            List<JSONObject> rows = new ArrayList<>();
+            for (SpecialCondolenceRecipient person : dao().query(
+                    SpecialCondolenceRecipient.class,
+                    Cnd.where("applyId", "=", id).asc("sortNum").asc("id"))) {
+                rows.add(JSONUtil.parseObj(person));
+            }
+            info.setRecipients(rows);
+        }
+        return info;
+    }
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void deleteApplication(String id) {
+        dao().clear(SpecialCondolenceRecipient.class,
+                Cnd.where("applyId", "=", id));
+        delete(id);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/impl/SpecialCondolenceTypeServiceImpl.java

@@ -0,0 +1,24 @@
+package com.budwk.app.zhgh.staffbenefit.specialcondolence.service.impl;
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.model.SpecialCondolenceType;
+import com.budwk.app.zhgh.staffbenefit.specialcondolence.service.SpecialCondolenceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @ClassName SpecialCondolenceTypeServiceImpl
+ * @Author JyuHsin
+ * @Date 2025/7/29 10:03
+ * @Version 1.0
+ * @Description TODO
+ */
+@Slf4j
+@IocBean(args = {"refer:dao"})
+public class SpecialCondolenceTypeServiceImpl extends BaseServiceImpl<SpecialCondolenceType> implements SpecialCondolenceTypeService {
+
+	public SpecialCondolenceTypeServiceImpl(Dao dao) {
+		super(dao);
+	}
+}

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java

@@ -20,6 +20,7 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.web.commons.base.Globals;
 import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService;
+import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -54,6 +55,8 @@ public class MemberApplyController {
     private FlowCommonService flowCommonService;
     @Inject
     private MemberCommonService memberCommonService;
+    @Inject
+    private MemberApplyRecordService memberApplyRecordService;
 
     @At("")
     @Ok("beetl:/platform/zhgh/staffmanage/member/apply/submit/index.html")
@@ -70,13 +73,14 @@ public class MemberApplyController {
 
     @At
     @ApiOperation("保存申请")
+    @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员入会申请", msg = "保存申请,申请人: ${args[0].username}")
     public Result save(@Param("data") MemberApplyRecord memberApplyRecord) {
         if (StrUtil.isBlank(memberApplyRecord.getId())) {
             memberCommonService.validateApplyOrChangeIsDoing(null, "apply");
         }
-        dao.insertOrUpdate(memberApplyRecord);
+        memberApplyRecordService.saveApplyRecord(memberApplyRecord);
         return Result.success();
     }
 
@@ -105,7 +109,7 @@ public class MemberApplyController {
                 .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
         args.set("type", Lang.isEmpty(group) ? "branch" : "group");
 
-        dao.insertOrUpdate(memberApplyRecord);
+        memberApplyRecordService.saveApplyRecord(memberApplyRecord);
 
         args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
         args.set(FlowConst.FORM_DATA, memberApplyRecord);
@@ -143,7 +147,7 @@ public class MemberApplyController {
                 .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
         dict.set("type", Lang.isEmpty(group) ? "branch" : "group");
 
-        dao.insertOrUpdate(memberApplyRecord);
+        memberApplyRecordService.saveApplyRecord(memberApplyRecord);
 
         dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
         dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java

@@ -64,7 +64,7 @@ public class MemberBranchUnionAuditController {
                     info.sex,
                     info.userName,
                     info.loginName,
-                    info.unitName,
+                    COALESCE(changeUnit.name, info.unitName) AS unitName,
                     info.unionName,
                     info.userState,
                     info.preparedBy,
@@ -91,6 +91,7 @@ public class MemberBranchUnionAuditController {
                     wf_process_task t
                     LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
                     LEFT JOIN member_change_record info ON info.id = ins.businessNo
+                    LEFT JOIN sys_unit changeUnit ON changeUnit.id = info.unitId
                     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
@@ -111,7 +112,8 @@ public class MemberBranchUnionAuditController {
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.desc("info.applyDateTime");
         } else {
-            cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+            // 单位列按实际显示名称排序，其他字段保持原有排序规则。
+            cnd.orderBy("unitName".equals(pageForm.getPageOrderName()) ? "unitName" : "info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
         cnd.groupBy("t.id");
         sql.setCondition(cnd);

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java

@@ -72,6 +72,7 @@ public class MemberChangeApplyController {
 
     @At
     @ApiOperation("保存申请")
+    @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission("member.apply.submit")
     @SLog(tag = "会员变更申请", msg = "保存申请,申请人: ${args[0].username}")
     public Result save(@Param("data") MemberChangeRecord memberChangeRecord) {
@@ -147,7 +148,7 @@ public class MemberChangeApplyController {
     @ApiModelProperty("根据id查询变更记录")
     @SaCheckPermission("member.change.apply")
     public Result findChangeById(String id){
-        return Result.success().addData(dao.fetch(MemberChangeRecord.class, id));
+        return Result.success().addData(memberCommonService.findChangeRecordWithUnitName(id));
     }
 
     /**

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java

@@ -76,7 +76,7 @@ public class MemberChangeMineController {
                     info.username,
                     info.loginname,
                     info.sex,
-                    info.unitName,
+                    COALESCE(changeUnit.name, info.unitName) AS unitName,
                     info.unionName,
                     info.userState,
                     info.preparedBy,
@@ -103,6 +103,7 @@ public class MemberChangeMineController {
                     member_change_record 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 sys_unit changeUnit ON changeUnit.id = info.unitId
                     LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
                 $condition
                 """);
@@ -124,7 +125,8 @@ public class MemberChangeMineController {
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.desc("info.applyDateTime");
         } else {
-            cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+            // 单位列按实际显示名称排序，其他字段保持原有排序规则。
+            cnd.orderBy("unitName".equals(pageForm.getPageOrderName()) ? "unitName" : "info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
         cnd.groupBy("t.id");
         sql.setCondition(cnd);
@@ -166,7 +168,7 @@ public class MemberChangeMineController {
     @ApiOperation("根据id查询变更记录")
     @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR)
     public Result findMemberChangeRecord(String id){
-        MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id);
+        MemberChangeRecord record = memberCommonService.findChangeRecordWithUnitName(id);
         NutMap nutMap = Lang.obj2nutmap(record);
 
         // 变更记录只保存三级单位 ID，查看时补充当前单位名称供页面展示。