feat: 困难帮扶 整改

.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,7 @@ RoleConstant {
     SCHOOL_UNION_ADMIN("校工会管理员"),
     SCHOOL_UNION_CHAIRMAN("校工会主席"),
     SCHOOL_UNION_VICE_CHAIRMAN("校工会副主席"),
+    SCHOOL_OFFICE_DIRECTOR("校工会办公室主任"),
     SCHOOL_UNION_WELFARE_ADMIN("校工会福利管理员"),
     SCHOOL_UNION_MEMBER_ADMIN("校工会会员管理员"),
     SCHOOL_UNION_TC_ADMIN("校工会教代会管理员"),
@@ -50,7 +51,7 @@ RoleConstant {
     BRANCH_UNION_WENTI_SPORTS("分工会文体福利委员"),
 
 	UNIT_PARTY_SECRETARY("单位党委书记"),
-	UNIT_SCHOOL_LEADER("分管校领导"),
+	UNIT_SCHOOL_LEADER("单位分管校领导"),
 
     TEACHER_CONGRESS_DELEGATE_FORMAL("教代会正式代表"),
     TEACHER_CONGRESS_DELEGATE_ATTENDANCE("教代会列席代表"),

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

@@ -31,6 +31,20 @@ public class SysOfficeTemplateUtil {
     @Inject
     private Dao dao;
 
+    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();
+    }
+
     /**
      * 获取模板文件输入流
      *

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,67 @@
+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 {
+            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/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java

@@ -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);
         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())) {
@@ -176,6 +179,12 @@ public class DifficultHelpApplyController {
     @ApiOperation("获取受助人")
     @SaCheckPermission("difficultHelp.apply")
     public Result queryRecipients(String key){
+        if (!AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            return Result.error("只有分工会主席可以替他人申请");
+        }
+        if (Strings.isBlank(SecurityUtil.getUnionId())) {
+            return Result.error("当前用户未设置所属分工会");
+        }
         Sql sql = Sqls.create("""
                 SELECT
                 	id,
@@ -194,13 +203,7 @@ 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());
-            }
-        }
+        cnd.and("unionid", "=", SecurityUtil.getUnionId());
 
         if (Strings.isNotBlank(key)) {
             SqlExpressionGroup group = new SqlExpressionGroup();

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

@@ -0,0 +1,74 @@
+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 amountApproval = "36ebafda-44c2-4bd3-bd7f-10839a575a0d".equals(task.getTaskName())
+                || "715ece82-4ae3-433c-ad18-ed875f45d1e3".equals(task.getTaskName());
+        if (!amountApproval && !"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("请填写审批意见");
+
+        String level = args.getStr("level");
+        Double money = amountApproval ? args.getDouble("money") : null;
+        if (amountApproval) {
+            if (StrUtil.isBlank(level) || money == null || !Double.isFinite(money) || money < 0) {
+                throw new BaseException("请填写完整的级别和帮扶金额");
+            }
+            args.put("tf_level", level);
+            args.put("tf_money", money);
+        }
+        // 参与者权限由流程引擎校验，业务入口不接受客户端指定管理员代办。
+        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("level", level).add("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
@@ -102,10 +105,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

@@ -68,6 +68,7 @@ public class DifficultHelpMineController {
         Sql sql = Sqls.create("""
                 SELECT
                     info.id,
+                    info.createdBy,
                     info.proxyUserName,
                     info.proxyLoginName,
                     info.userName,
@@ -78,6 +79,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 +105,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 +124,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);

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

@@ -21,6 +21,10 @@ 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;
@@ -361,6 +365,9 @@ public class DifficultHelpReadingController {
                 .build();
 
         String templateName= "difficulty_apply";
+        docData.put("applyMoney", difficultHelp.getApplyMoney());
+        docData.put("money", difficultHelp.getMoney());
+        fillApplyApprovals(docData, difficultHelp.getId());
         if (print) {
             exportAsPDF(templateName, docData, config, difficultHelp, response);
         } else {
@@ -368,14 +375,89 @@ public class DifficultHelpReadingController {
         }
     }
 
+    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, "");
+        }
+        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()) || (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, "");
+                }
+                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"));
+                if (i < 2 && data.get("money") != null) {
+                    opinion += "\n级别：" + StrUtil.nullToEmpty(data.getStr("level")) + "  帮扶金额：" + data.get("money") + "元";
+                }
+                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);
+            }
+        }
+    }
+
+    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
     private void exportAsPDF(String templateName, HashMap<String, Object> docData,Configure config,
                              DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
-        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
+        String fileName = FileUtil.mainName(sysOfficeTemplateUtil.getTemplateFileName(templateName)) + "_" + difficultHelp.getUserName() + "_" +
                 DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
+            XWPFTemplate.compile(getApplyTemplate(templateName),config)
                     .render(docData)
                     .writeAndClose(byteArrayOutputStream);
             byte[] bytes = byteArrayOutputStream.toByteArray();
@@ -396,11 +478,11 @@ public class DifficultHelpReadingController {
     @At
     private void exportAsWord(String templateName, HashMap<String, Object> docData,Configure config,
                               DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
-        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
+        String fileName = FileUtil.mainName(sysOfficeTemplateUtil.getTemplateFileName(templateName)) + "_" + difficultHelp.getUserName() + "_" +
                 DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
+            XWPFTemplate.compile(getApplyTemplate(templateName),config)
                     .render(docData)
                     .writeAndClose(byteArrayOutputStream);
             CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), 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
@@ -103,6 +106,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 +125,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
@@ -106,10 +109,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 +163,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,8 @@ import java.util.List;
  */
 public interface DifficultHelpCommonService extends BaseService<DifficultHelpInfo> {
 
+    void validateApplyUser(DifficultHelpInfo difficultHelpInfo);
+
     /**
      * 导入实际金额数据处理
      * @param file     文件

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

@@ -4,6 +4,10 @@ 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.constant.RoleConstant;
+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 +54,34 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
     @Inject
     private ManyAddOrRenewUtil manyAddOrRenewUtil;
 
+    @Override
+    public void validateApplyUser(DifficultHelpInfo difficultHelpInfo) {
+        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 (difficultHelpInfo.getApplyMoney() == null || !Double.isFinite(difficultHelpInfo.getApplyMoney())
+                || difficultHelpInfo.getApplyMoney() <= 0) {
+            throw new BaseException("请填写大于零的申请金额");
+        }
+        if (difficultHelpInfo.getUserId().equals(SecurityUtil.getUserId())) {
+            return;
+        }
+        if (!AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            throw new BaseException("只有分工会主席可以替他人申请");
+        }
+        View_user recipient = dao().fetch(View_user.class, Cnd.where("id", "=", difficultHelpInfo.getUserId()));
+        if (recipient == null || 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) {

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

@@ -33,6 +33,10 @@ public class DifficultHelpPageParam extends PageForm {
     private List<String> dateRange;
 
     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 +50,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/resources/db/script/20261009/difficult_help_apply_money.sql

@@ -0,0 +1 @@
+ALTER TABLE difficult_help_info ADD COLUMN applyMoney VARCHAR(200) NULL COMMENT '申请金额';

src/main/resources/db/script/20261009/困难帮扶_职工慰问.sql

@@ -0,0 +1,116 @@
+# 新增角色
+INSERT INTO sys_role (id, name, code, aliasName, disabled, unitid, moduleId, note, sort, createdBy, createdAt,
+                      updatedBy, updatedAt, delFlag)
+VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '校工会办公室主任', 'SCHOOL_OFFICE_DIRECTOR', null, false, null,
+        '07d940ba34bd47399cda140894f5d86b', null, null, '17a7f8ad3ee947b4a26175049a9c253d', 1791510778436,
+        '17a7f8ad3ee947b4a26175049a9c253d', 1791510778437, false);
+
+# 修改审核菜单名称
+UPDATE sys_menu t
+SET t.name = '校工会办公室主任审批'
+WHERE t.id = 'df2fb530141c4245826ac9974ec90c9a';
+
+UPDATE sys_menu t
+SET t.name = '校工会主席审批'
+WHERE t.id = 'a473302b80ce404e93bc820f858a14da';
+
+UPDATE sys_menu t
+SET t.name = '分管校领导审批'
+WHERE t.id = '3e0bb63c5f0044bd837ad24633e92560';
+
+UPDATE sys_menu t
+SET t.name = '校工会办公室主任审批'
+WHERE t.id = '23d30124199b486d8af79aba62440b15';
+
+UPDATE sys_menu t
+SET t.name = '校工会主席审批'
+WHERE t.id = 'd736e4d7e8644cf38f248e7ad87ed6ad';
+
+UPDATE sys_menu t
+SET t.name = '分管校领导审批'
+WHERE t.id = '35a9239d754c47b9afccce173cb72d64';
+
+# 清除之前的菜单角色权限
+# 校工会办公室主任审批
+delete
+from sys_role_menu
+where menuId = 'df2fb530141c4245826ac9974ec90c9a';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'df2fb530141c4245826ac9974ec90c9a');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', 'df2fb530141c4245826ac9974ec90c9a');
+
+delete
+from sys_role_menu
+where menuId = '23d30124199b486d8af79aba62440b15';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '23d30124199b486d8af79aba62440b15');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '23d30124199b486d8af79aba62440b15');
+
+# 校工会主席审批
+delete
+from sys_role_menu
+where menuId = 'a473302b80ce404e93bc820f858a14da';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'a473302b80ce404e93bc820f858a14da');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', 'a473302b80ce404e93bc820f858a14da');
+
+delete
+from sys_role_menu
+where menuId = 'd736e4d7e8644cf38f248e7ad87ed6ad';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'd736e4d7e8644cf38f248e7ad87ed6ad');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', 'd736e4d7e8644cf38f248e7ad87ed6ad');
+
+# 分管校领导审批
+delete
+from sys_role_menu
+where menuId = '3e0bb63c5f0044bd837ad24633e92560';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '3e0bb63c5f0044bd837ad24633e92560');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('b3854469e6f44901b22bb791cb538431', '3e0bb63c5f0044bd837ad24633e92560');
+
+delete
+from sys_role_menu
+where menuId = '35a9239d754c47b9afccce173cb72d64';
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '35a9239d754c47b9afccce173cb72d64');
+INSERT INTO sys_role_menu (roleId, menuId)
+VALUES ('b3854469e6f44901b22bb791cb538431', '35a9239d754c47b9afccce173cb72d64');
+
+# 更新权限
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'difficultHelp.firstApproval'
+WHERE permission = 'difficultHelp.branchUnionApproval';
+
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'difficultHelp.secondApproval'
+WHERE permission = 'difficultHelp.unionLeaderApproval';
+
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'difficultHelp.thirdApproval'
+WHERE permission = 'difficultHelp.schoolUnionApproval';
+
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'h5.difficultHelp.firstApproval'
+WHERE permission = 'h5.difficultHelp.branchUnionApproval';
+
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'h5.difficultHelp.secondApproval'
+WHERE permission = 'h5.difficultHelp.unionLeaderApproval';
+
+UPDATE zhgh_cqgmy.sys_menu
+SET permission = 'h5.difficultHelp.thirdApproval'
+WHERE permission = 'h5.difficultHelp.schoolUnionApproval';
+
+# 新增字典项
+INSERT INTO sys_dict (id, parentId, path, name, code, disabled, location, hasChildren, createdBy, createdAt, updatedBy,
+                      updatedAt, delFlag, remark)
+VALUES ('4d3e3472ae324552b16f0aaf07c37004', '501e0a4edca748ddb739ffb679170d50', '00020017', '校工会办公室主任',
+        'SCHOOL_OFFICE_DIRECTOR', false, 9614, false, '17a7f8ad3ee947b4a26175049a9c253d', 1791517263500,
+        '17a7f8ad3ee947b4a26175049a9c253d', 1791517263500, false, null);
+

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html

@@ -17,7 +17,7 @@
 					           @change="modeChange"
 					           :disabled="formData.id" style="width: 100%">
 						<el-option label="本人申请" value="1"></el-option>
-						<el-option v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')"
+						<el-option v-if="$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')"
 						           label="替他人申请" value="2"></el-option>
 					</el-select>
 				</el-form-item>
@@ -127,7 +127,12 @@
 			</el-descriptions-item>
 
 
-			<el-descriptions-item label="申请原因" :span="3">
+			<el-descriptions-item label="申请金额（元）">
+                    <el-form-item prop="applyMoney" :rules="[{required:true,type:'number',min:0.01,message:'请填写大于零的申请金额',trigger:['change','blur']}]">
+                        <el-input-number v-model="formData.applyMoney" :precision="2" :min="0.01" placeholder="请输入申请金额"></el-input-number>
+                    </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item label="申请原因" :span="3">
 				<el-form-item prop="reason">
 					<el-input maxlength="500" :autosize="{ minRows: 5, maxRows: 10}"
 					          placeholder="请简述申请原因"
@@ -230,6 +235,7 @@
 				businessId: GetQueryString("businessId"),
 				instanceId: GetQueryString("instanceId"),
 				formData: {
+					applyMoney: undefined,
 					id: GetQueryString("businessId"),
 					mode: '1'
 				},
@@ -263,6 +269,9 @@
 		methods: {
 			// 查询受助人
 			queryRecipients(key) {
+				if (String(this.formData.mode) !== "2" || !this.$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')) {
+					return
+				}
 				this.$axios.get("/platform/difficultHelp/apply/queryRecipients", {
 					key
 				}).then(res => {

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html

@@ -15,7 +15,7 @@ layout("/layouts/platform.html"){
 					<el-form-item prop="mode">
 						<el-select v-model="formData.mode" placeholder="申请模式" @change="modeChange" style="width: 100%">
 							<el-option label="本人申请" value="1"></el-option>
-							<el-option v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')"
+							<el-option v-if="$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')"
 									   label="替他人申请" value="2"></el-option>
 						</el-select>
 					</el-form-item>
@@ -151,7 +151,12 @@ layout("/layouts/platform.html"){
 					</el-form-item>
 				</el-descriptions-item>
 
-				<el-descriptions-item label="生活致困原因" :span="3">
+				<el-descriptions-item label="申请金额（元）">
+                    <el-form-item prop="applyMoney" :rules="[{required:true,type:'number',min:0.01,message:'请填写大于零的申请金额',trigger:['change','blur']}]">
+                        <el-input-number v-model="formData.applyMoney" :precision="2" :min="0.01" placeholder="请输入申请金额"></el-input-number>
+                    </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item label="生活致困原因" :span="3">
 					<el-form-item prop="reason">
 						<el-input maxlength="500" :autosize="{ minRows: 5, maxRows: 10}"
 						          placeholder="请简述生活致困原因"
@@ -315,6 +320,7 @@ layout("/layouts/platform.html"){
 				time: '',
 				blockMessage: '',
 				formData: {
+					applyMoney: undefined,
 					id: GetQueryString("bizId"),
 					mode: '1',
 					applyCount: '1',
@@ -429,6 +435,9 @@ layout("/layouts/platform.html"){
 
 			// 查询受助人
 			queryRecipients(key) {
+				if (String(this.formData.mode) !== "2" || !this.$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')) {
+					return
+				}
 				this.$axios.post("/platform/difficultHelp/apply/queryRecipients", {
 					key
 				}).then(res => {
@@ -605,7 +614,7 @@ layout("/layouts/platform.html"){
 				this.$axios.post('/platform/difficultHelp/apply/getIsCanPlay').then(res => {
 					if (res.code === 0) {
 						// 新增申请进入页面时，优先校验当前登录人本年度是否已经申请过，已申请则直接拦截新增。
-						if (!this.bizId && res.data.hasCurrentYearApply) {
+						if (!this.bizId && res.data.hasCurrentYearApply && !this.$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')) {
 							this.isShow = false
 							this.$set(this, 'blockMessage', '抱歉，您本年度已申请困难帮扶，不能重复申请。')
 						} else {

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html

@@ -1,8 +1,23 @@
 <div id="difficult_help_branch_union_approval_form">
-	<el-form :model="formData" ref="formRef" label-width="0" label-suffix="：" class="flow-task-form">
+	<el-form :model="formData" ref="formRef" label-width="100px" label-suffix="：">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+					<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="帮扶金额" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+					<el-input-number v-model="formData.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+				</el-form-item>
+			</el-col>
+		</el-row>
 		<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
 			<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 		</el-form-item>
+		<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+			<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+		</el-form-item>
 	</el-form>
 	<snaker-flow-task-form-action @task-action="handleTaskAction" @cancel="handleCancel"></snaker-flow-task-form-action>
 </div>
@@ -14,14 +29,23 @@
 			return {
 				businessId: GetQueryString("businessId"),
 				formData: {
-					tf_opinion: ""
+					level: "",
+					money: undefined,
+					tf_sign: "", tf_opinion: ""
 				},
 			}
 		},
 		methods: {
-			handleTaskAction(val) {
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
+
 				console.log(val)
-				this.$axios.post("/flow/common/executeTask", {
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 					data: JSON.stringify({
 						...val,
 						...this.formData

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html

@@ -82,18 +82,56 @@ layout("/layouts/platform.html"){
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
 
+		<el-dialog title="设置帮扶审批信息" :visible.sync="batchVisible" width="760px">
+			<el-form :model="batchForm" ref="batchFormRef" label-width="130px">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+							<dict-select v-model="batchForm.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="帮扶金额（元）" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+							<el-input-number v-model="batchForm.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,whitespace:true,message:'请填写审批意见',trigger:['change','blur']}]">
+					<user-opinion-textarea v-model="batchForm.tf_opinion"></user-opinion-textarea>
+				</el-form-item>
+				<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+					<pc-signature v-model="batchForm.tf_sign" :key="batchForm.processTaskId"></pc-signature>
+				</el-form-item>
+			</el-form>
+			<span slot="footer"><el-button @click="batchVisible = false">取消</el-button><el-button type="primary" @click="submitBatch">确定</el-button></span>
+		</el-dialog>
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
 					<div class="process-title">
 						{{formData.taskName}}
 					</div>
-					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
-					         class="flow-task-form">
+					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="100px" label-suffix="：">
+						<el-row :gutter="20">
+							<el-col :span="12">
+								<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+									<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="帮扶金额" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+									<el-input-number v-model="formData.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+								</el-form-item>
+							</el-col>
+						</el-row>
 						<el-form-item label="审批意见" prop="tf_opinion"
 						              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
 							<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 						</el-form-item>
+						<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+							<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+						</el-form-item>
 					</el-form>
 					<el-row type="flex" justify="end">
 						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
@@ -132,13 +170,15 @@ layout("/layouts/platform.html"){
 					{ prop: "subsidyStandards", label: "困难类型", sortable: true },
 					{ prop: "applyTime", label: "申请时间", sortable: true },
 					{ prop: "applyCount", label: "申请次数", sortable: true },
-					{ prop: "taskName", label: "当前节点" },
+					{ prop: "curTaskName", label: "当前节点" },
 					{ prop: "instanceState", label: "流程状态" }
 				],
 				unions: [],
 				units: [],
 
 				formData: {},
+				batchVisible: false,
+				batchForm: {level: "", money: undefined, tf_sign: "", tf_opinion: ""},
 				showApprovalForm: false,
 				selectData: []
 			}
@@ -168,12 +208,23 @@ layout("/layouts/platform.html"){
 					return;
 				}
 				
+				this.batchForm = {level: "", money: undefined, tf_sign: "", tf_opinion: ""}
+				this.batchVisible = true
+			},
+			async submitBatch() {
+				try {
+					const valid = await this.$refs.batchFormRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
 				const message = '确定要一键审核这 ' + this.selectData.length + ' 条记录吗？';
 				this.$confirm(message, '批量审核确认', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
+					this.batchVisible = false;
 					this.batchApprove(this.selectData);
 				}).catch(() => {
 
@@ -221,10 +272,10 @@ layout("/layouts/platform.html"){
 
 			approveSingleItem(item) {
 				return new Promise((resolve, reject) => {
-					this.$axios.post("/flow/common/executeTask", {
+					this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 						data: JSON.stringify({
 							processTaskId: item.taskId,
-							tf_opinion: '审核通过',
+							...this.batchForm,
 							submitType: 1
 						})
 					}).then((res) => {
@@ -243,19 +294,29 @@ layout("/layouts/platform.html"){
 					this.showApprovalForm = true
 					this.formData = {
 						processTaskId: row.taskId,
-						taskName: row.curTaskName
+						taskName: row.curTaskName,
+						level: "",
+						money: undefined,
+						tf_sign: "", tf_opinion: ""
 					}
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
 
-			handleTaskAction(val) {
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
+
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning"
 				}).then(() => {
-					this.$axios.post("/flow/common/executeTask", {
+					this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 						data: JSON.stringify({
 							...this.formData,
 							submitType: val

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js

@@ -6,6 +6,7 @@ const INFO = {
             </div>
             <el-descriptions :column="3" border>
                 <el-descriptions-item label="填写人姓名">{{ viewData.proxyUserName }}</el-descriptions-item>
+                <el-descriptions-item label="申请金额（元）">{{ viewData.applyMoney }}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
                 <el-descriptions-item label="填写人工号">{{ viewData.proxyLoginName }}</el-descriptions-item>
                 <!--\t\t<el-descriptions-item label="申请模式">{{ viewData.mode == 1 ? '本人申请' : '替他人申请' }}</el-descriptions-item>-->
@@ -87,12 +88,15 @@ const INFO = {
                                       :value="task.ext.submitType"></dict-tag>
                         </el-descriptions-item>
 
-                        <template v-if="task.displayName == '校工会审核'">
-                            <el-descriptions-item label="审批级别">{{ viewData.level }}</el-descriptions-item>
-                            <el-descriptions-item label="审批金额">{{ '￥' + viewData.money }}</el-descriptions-item>
+                        <template v-if="task.taskFormData.level != null">
+                            <el-descriptions-item label="审批级别">{{ task.taskFormData.level }}</el-descriptions-item>
+                            <el-descriptions-item label="帮扶金额（元）">{{ task.taskFormData.money }}</el-descriptions-item>
                         </template>
 
 
+                        <el-descriptions-item label="审批签字" :span="3" v-if="task.taskFormData && task.taskFormData.sign">
+                            <el-image :src="task.taskFormData.sign" style="height: 80px" fit="contain"></el-image>
+                        </el-descriptions-item>
                         <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
                             task.taskFormData.opinion }}
                         </el-descriptions-item>

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html

@@ -64,16 +64,22 @@ layout("/layouts/platform.html"){
 						          size="small"></enum-tag>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" fixed="right" width="300px">
+				<el-table-column label="操作" fixed="right" width="300px" class-name="difficult-help-mine-actions">
 					<template slot-scope="{row}">
 						<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
-						<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">
+						<el-button v-if="row.createdBy === $store.state.user.id && (row.taskKey === 'startTask' || !row.instanceId)" @click="onEdit(row)" size="mini" type="primary">
 							编辑
 						</el-button>
-						<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+						<el-button v-if="row.createdBy === $store.state.user.id && row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
 						</el-button>
-						<el-button  @click="doExportApply(row)" size="mini" type="primary">打印</el-button>
-						<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+						<el-dropdown v-if="row.createdBy === $store.state.user.id && row.instanceState == 20" trigger="click" @command="format => doExportApply(row, format)">
+							<el-button size="mini" type="primary">导出</el-button>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item command="pdf">导出 PDF</el-dropdown-item>
+								<el-dropdown-item command="word">导出 Word</el-dropdown-item>
+							</el-dropdown-menu>
+						</el-dropdown>
+						<el-button v-if="row.createdBy === $store.state.user.id && (row.taskKey === 'startTask' || !row.instanceId)" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -87,6 +93,18 @@ layout("/layouts/platform.html"){
 
 </div>
 
+<style nonce="${cspNonce!}">
+	#app .difficult-help-mine-actions .cell {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 10px;
+	}
+	#app .difficult-help-mine-actions .cell > .el-button {
+		margin-left: 0;
+	}
+</style>
+
 <script nonce="${cspNonce!}">
 	<!--#include("../common/info.js"){}#-->
 
@@ -107,6 +125,7 @@ layout("/layouts/platform.html"){
 					{ prop: "unitName", label: "所属单位", sortable: true },
 					{ prop: "mobile", label: "联系方式", sortable: true },
 					{ prop: "subsidyStandards", label: "困难类型", sortable: true },
+					{ prop: "applyMoney", label: "申请金额", sortable: true, width: "135"},
 					{ prop: "money", label: "实际帮扶金额", sortable: true, width: "135"},
 					{ prop: "applyTime", label: "申请时间", sortable: true },
 					{ prop: "applyCount", label: "申请次数", sortable: true },
@@ -168,8 +187,8 @@ layout("/layouts/platform.html"){
 					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
 				}
 			},
-			doExportApply(row) {
-				this.$downLoad('/platform/difficultHelp/reading/doExportApply?id=' + row.id + '&print=true')
+			doExportApply(row, format) {
+				this.$downLoad('/platform/difficultHelp/reading/doExportApply?id=' + row.id + '&print=' + (format === 'pdf'))
 			}
 		},
 		async created() {

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html

@@ -1,11 +1,11 @@
 <div id="difficult_help_school_union_approval_form">
-	<el-form :model="formData" ref="formRef" label-width="0" label-suffix="：" class="flow-task-form">
-		<el-form-item label="审核金额" prop="tf_money" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-			<el-input-number placeholder="请输入金额" v-model="formData.tf_money"></el-input-number>
-		</el-form-item>
-		<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+	<el-form :model="formData" ref="formRef" label-width="100px" label-suffix="：">
+		<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,whitespace:true,message:'请填写审批意见',trigger:['change','blur']}]">
 			<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 		</el-form-item>
+		<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+			<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+		</el-form-item>
 	</el-form>
 	<snaker-flow-task-form-action @task-action="handleTaskAction" @cancel="handleCancel"></snaker-flow-task-form-action>
 </div>
@@ -17,15 +17,20 @@
 			return {
 				businessId: GetQueryString("businessId"),
 				formData: {
-					tf_money: 0,
-					tf_opinion: "",
+					tf_sign: "", tf_opinion: "",
 				},
 			}
 		},
 		methods: {
-			handleTaskAction(val) {
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
 				console.log(val)
-				this.$axios.post("/flow/common/executeTask", {
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 					data: JSON.stringify({
 						...val,
 						...this.formData

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html

@@ -83,11 +83,11 @@ layout("/layouts/platform.html"){
 
 		<el-dialog title="设置审核信息" :visible.sync="dialogVisible" width="30%" center>
 			<el-form :model="formData" ref="formData" label-width="100px">
-				<el-form-item label="级别" prop="level" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-					<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+				<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,whitespace:true,message:'请填写审批意见',trigger:['change','blur']}]">
+					<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 				</el-form-item>
-				<el-form-item label="审核金额" prop="money" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-					<el-input-number placeholder="请输入金额" v-model="formData.money" style="width: 100%" :precision="2" :min="0"></el-input-number>
+				<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+					<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
 				</el-form-item>
 			</el-form>
 			<span slot="footer" class="dialog-footer">
@@ -103,25 +103,13 @@ layout("/layouts/platform.html"){
 						{{formData.taskName}}
 					</div>
 					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="100px" label-suffix="：">
-						<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="级别" prop="level" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-								<search-item>
-									<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
-								</search-item>
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="审核金额" prop="money" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-								<el-input-number placeholder="请输入金额" v-model="formData.money" style="width: 100%" :precision="2"
-												 :min="0" ></el-input-number>
-							</el-form-item>
-						</el-col>
-					</el-row>
 						<el-form-item label="审批意见" prop="tf_opinion"
-						              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+						              :rules="[{required:true,whitespace:true,message:'请填写审批意见',trigger:['change','blur']}]">
 							<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 						</el-form-item>
+						<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+							<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+						</el-form-item>
 					</el-form>
 					<el-row type="flex" justify="end">
 						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
@@ -166,14 +154,10 @@ layout("/layouts/platform.html"){
 				units: [],
 
 				formData: {
-					level: '',
-					money: 0,
-					tf_opinion: "",
+					tf_sign: "", tf_opinion: "",
 				},
 				showApprovalForm: false,
 				auditForm: {
-					level: '',
-					money: 0
 				},
 				dialogVisible: false
 			}
@@ -254,39 +238,17 @@ layout("/layouts/platform.html"){
 				}
 			},
 
-			approveSingleItem(item) {
-				return new Promise((resolve, reject) => {
-					this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
-						data: JSON.stringify({
-							...this.formData,
-							id: item.id
-						})
-					}).then((saveRes) => {
-						if (saveRes.code !== 0) {
-							throw new Error(saveRes.msg || '保存失败');
-						}
-						return this.$axios.post("/flow/common/executeTask", {
-							data: JSON.stringify({
-								processTaskId: item.taskId,
-								tf_opinion: '审核通过',
-								submitType: 1,
-							})
-						});
-					}).then((taskRes) => {
-						if (taskRes.code === 0) {
-							resolve(taskRes);
-						} else {
-							throw new Error(taskRes.msg || '审批失败');
-						}
-					}).catch((error) => {
-						reject(error);
-					});
-				});
+			async approveSingleItem(item) {
+				const res = await this.$axios.post("/platform/difficultHelp/approval/executeTask", {
+					data: JSON.stringify({processTaskId: item.taskId, tf_opinion: this.formData.tf_opinion, tf_sign: this.formData.tf_sign, submitType: 1})
+				})
+				if (res.code !== 0) throw new Error(res.msg || '审批失败')
 			},
 			openAudit(row) {
 				this.$refs.guava.edit(()=>{
 					this.showApprovalForm = true
 					this.formData = {
+					tf_sign: "",
 						processTaskId: row.taskId,
 						taskName: row.curTaskName,
 						id: row.id
@@ -295,35 +257,24 @@ layout("/layouts/platform.html"){
 				})
 			},
 
-			handleTaskAction(val) {
-					this.$confirm("您确定要提交吗？", "提示", {
-						confirmButtonText: "确定",
-						cancelButtonText: "取消",
-						type: "warning"
-					}).then(() => {
-						this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
-							data: JSON.stringify({
-								...this.formData,
-							})
-						}).then((saveRes) => {
-							if (saveRes.code === 0) {
-								this.$axios.post("/flow/common/executeTask", {
-									data: JSON.stringify({
-										...this.formData,
-										submitType: val
-									})
-								}).then((taskRes) => {
-									if (taskRes.code === 0) {
-										this.$message.success('操作成功');
-										this.$refs.guava.index();
-										this.doSearch();
-									}
-								});
-							}
-						});
-					}).catch(() => {
-
-					});
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
+				this.$confirm("您确定要提交吗？", "提示", {type: "warning"}).then(() => {
+					this.$axios.post("/platform/difficultHelp/approval/executeTask", {
+						data: JSON.stringify({...this.formData, submitType: val})
+					}).then(res => {
+						if (res.code === 0) {
+							this.$message.success('操作成功')
+							this.$refs.guava.index()
+							this.doSearch()
+						}
+					})
+				}).catch(() => {})
 			},
 
 			onRevoke(row) {

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/form.html

@@ -1,8 +1,23 @@
 <div id="difficult_help_branch_union_approval_form">
-	<el-form :model="formData" ref="formRef" label-width="0" label-suffix="：" class="flow-task-form">
+	<el-form :model="formData" ref="formRef" label-width="100px" label-suffix="：">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+					<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="帮扶金额" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+					<el-input-number v-model="formData.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+				</el-form-item>
+			</el-col>
+		</el-row>
 		<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
 			<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 		</el-form-item>
+		<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+			<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+		</el-form-item>
 	</el-form>
 	<snaker-flow-task-form-action @task-action="handleTaskAction" @cancel="handleCancel"></snaker-flow-task-form-action>
 </div>
@@ -14,14 +29,23 @@
 			return {
 				businessId: GetQueryString("businessId"),
 				formData: {
-					tf_opinion: ""
+					level: "",
+					money: undefined,
+					tf_sign: "", tf_opinion: ""
 				},
 			}
 		},
 		methods: {
-			handleTaskAction(val) {
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
+
 				console.log(val)
-				this.$axios.post("/flow/common/executeTask", {
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 					data: JSON.stringify({
 						...val,
 						...this.formData

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html

@@ -81,18 +81,56 @@ layout("/layouts/platform.html"){
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
 
+		<el-dialog title="设置帮扶审批信息" :visible.sync="batchVisible" width="760px">
+			<el-form :model="batchForm" ref="batchFormRef" label-width="130px">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+							<dict-select v-model="batchForm.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="帮扶金额（元）" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+							<el-input-number v-model="batchForm.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="审批意见" prop="tf_opinion" :rules="[{required:true,whitespace:true,message:'请填写审批意见',trigger:['change','blur']}]">
+					<user-opinion-textarea v-model="batchForm.tf_opinion"></user-opinion-textarea>
+				</el-form-item>
+				<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+					<pc-signature v-model="batchForm.tf_sign" :key="batchForm.processTaskId"></pc-signature>
+				</el-form-item>
+			</el-form>
+			<span slot="footer"><el-button @click="batchVisible = false">取消</el-button><el-button type="primary" @click="submitBatch">确定</el-button></span>
+		</el-dialog>
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
 					<div class="process-title">
 						{{formData.taskName}}
 					</div>
-					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
-					         class="flow-task-form">
+					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="100px" label-suffix="：">
+						<el-row :gutter="20">
+							<el-col :span="12">
+								<el-form-item label="级别" prop="level" :rules="[{required:true,message:'请选择级别',trigger:['change','blur']}]">
+									<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="帮扶金额" prop="money" :rules="[{required:true,message:'请填写帮扶金额',trigger:['change','blur']}]">
+									<el-input-number v-model="formData.money" style="width: 100%" :precision="2" :min="0" placeholder="请输入帮扶金额"></el-input-number>
+								</el-form-item>
+							</el-col>
+						</el-row>
 						<el-form-item label="审批意见" prop="tf_opinion"
 						              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
 							<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
 						</el-form-item>
+						<el-form-item label="签字" prop="tf_sign" :rules="[{required:true,message:'请完成审批签字',trigger:['change','blur']}]">
+							<pc-signature v-model="formData.tf_sign" :key="formData.processTaskId"></pc-signature>
+						</el-form-item>
 					</el-form>
 					<el-row type="flex" justify="end">
 						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
@@ -138,6 +176,8 @@ layout("/layouts/platform.html"){
 				units: [],
 
 				formData: {},
+				batchVisible: false,
+				batchForm: {level: "", money: undefined, tf_sign: "", tf_opinion: ""},
 				showApprovalForm: false,
 				selectData: [],
 			}
@@ -161,12 +201,23 @@ layout("/layouts/platform.html"){
 					this.$message.warning('请勾选待审核数据！');
 					return;
 				}
+				this.batchForm = {level: "", money: undefined, tf_sign: "", tf_opinion: ""}
+				this.batchVisible = true
+			},
+			async submitBatch() {
+				try {
+					const valid = await this.$refs.batchFormRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
 				const message = '确定要一键审核这 ' + this.selectData.length + ' 条记录吗？';
 				this.$confirm(message, '批量审核确认', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
+					this.batchVisible = false;
 					this.batchApprove(this.selectData);
 				}).catch(() => {
 
@@ -214,10 +265,10 @@ layout("/layouts/platform.html"){
 
 			approveSingleItem(item) {
 				return new Promise((resolve, reject) => {
-					this.$axios.post("/flow/common/executeTask", {
+					this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 						data: JSON.stringify({
 							processTaskId: item.taskId,
-							tf_opinion: '审核通过',
+							...this.batchForm,
 							submitType: 1
 						})
 					}).then((res) => {
@@ -236,19 +287,29 @@ layout("/layouts/platform.html"){
 					this.showApprovalForm = true
 					this.formData = {
 						processTaskId: row.taskId,
-						taskName: row.curTaskName
+						taskName: row.curTaskName,
+						level: "",
+						money: undefined,
+						tf_sign: "", tf_opinion: ""
 					}
 					this.$refs.infoRef.onOpen(row)
 				})
 			},
 
-			handleTaskAction(val) {
+			async handleTaskAction(val) {
+				try {
+					const valid = await this.$refs.formRef.validate()
+					if (!valid) return
+				} catch (error) {
+					return
+				}
+
 				this.$confirm("您确定要提交吗？", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning"
 				}).then(() => {
-					this.$axios.post("/flow/common/executeTask", {
+					this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 						data: JSON.stringify({
 							...this.formData,
 							submitType: val

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html

@@ -5,7 +5,8 @@
 		<el-descriptions-item label="申请模式">{{ viewData.mode == 1 ? '本人申请' : '替他人申请' }}</el-descriptions-item>
 
 		<el-descriptions-item label="受助人">{{ viewData.userName + '(' + viewData.loginName + ')' }}</el-descriptions-item>
-		<el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
+		<el-descriptions-item label="申请金额（元）">{{ viewData.applyMoney }}</el-descriptions-item>
+                <el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
 		<el-descriptions-item label="出生年月">{{ viewData.birthday }}</el-descriptions-item>
 
 		<el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html

@@ -94,6 +94,22 @@ layout("/layouts/platform_h5.html"){
         color: #f06464;
     }
 
+    .difficult-help-apply-form .difficult-help-apply-mode {
+        flex-wrap: nowrap;
+        gap: 8px;
+    }
+
+    .difficult-help-apply-form .difficult-help-apply-mode .van-radio {
+        flex-shrink: 0;
+        margin-right: 0;
+    }
+
+    .difficult-help-apply-form .difficult-help-apply-mode .van-radio__label {
+        margin-left: 4px;
+        font-size: 12px;
+        white-space: nowrap;
+    }
+
     .difficult-help-apply-actions {
         position: fixed;
         z-index: 100;
@@ -308,10 +324,10 @@ layout("/layouts/platform_h5.html"){
                                required name="proxyLoginName"></van-field>
                     <van-field label="申请模式" name="mode" required :rules="[{ required: true }]">
                         <template #input>
-                            <van-radio-group v-model="formData.mode" @change="modeChange" direction="horizontal">
+                            <van-radio-group class="difficult-help-apply-mode" :value="formData.mode" @input="formData.mode !== $event && modeChange($event)" direction="horizontal" icon-size="14px">
                                 <van-radio name="1" shape="square">本人申请</van-radio>
                                 <van-radio
-                                        v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')"
+                                        v-if="$auth.hasRoleOr('BRANCH_UNION_CHAIRMAN')"
                                         name="2" shape="square">替他人申请
                                 </van-radio>
                             </van-radio-group>
@@ -496,6 +512,9 @@ layout("/layouts/platform_h5.html"){
                             name="bankOfDeposit"
                     ></van-field>
 
+                    <van-field v-model="formData.applyMoney" name="applyMoney" label="申请金额（元）" type="number"
+                               placeholder="请输入申请金额" required
+                               :rules="[{required:true,message:'请填写申请金额'},{validator: value => Number(value) > 0, message:'申请金额必须大于零'}]"></van-field>
                     <van-field
                             v-model="formData.reason"
                             label="生活致困原因"
@@ -685,6 +704,7 @@ layout("/layouts/platform_h5.html"){
                 recipientHasSearched: false,
                 historyLayerPageKey: "difficult-help-apply",
                 formData: {
+                    applyMoney: undefined,
                     id: GetQueryString("bizId"),
                     mode: "1",
                     familyList: [],

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html

@@ -114,6 +114,33 @@ layout("/layouts/platform_h5.html"){
 					审批意见<span class="difficult-help-audit-card__required">*</span>
 				</h2>
 				<van-form ref="formRef">
+				<section class="difficult-help-info-card">
+					<h2 class="difficult-help-info-card__title">审核信息</h2>
+					<div class="difficult-help-audit-form">
+						<van-field
+								v-model="formData.level"
+								class="difficult-help-audit-select"
+								name="level"
+								label="级别"
+								placeholder="请选择级别"
+								readonly
+								is-link
+								required
+								@click="openLevelPicker"
+								:rules="[{ required: true, message: '请选择级别' }]"
+						></van-field>
+						<van-field
+								v-model="formData.money"
+								class="difficult-help-audit-money"
+								name="money"
+								label="帮扶金额（元）"
+								placeholder="请输入帮扶金额（元）"
+								type="number"
+								required
+								:rules="[{ required: true, message: '请输入帮扶金额（元）' }]"
+						></van-field>
+					</div>
+				</section>
 					<van-field
 							v-model="formData.tf_opinion"
 							class="difficult-help-audit-textarea"
@@ -125,7 +152,13 @@ layout("/layouts/platform_h5.html"){
 							maxlength="100"
 							show-word-limit
 					></van-field>
-				</van-form>
+					<section class="difficult-help-info-card">
+					<h2 class="difficult-help-info-card__title">审批签字</h2>
+					<van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+						<template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
+					</van-field>
+				</section>
+			</van-form>
 			</section>
 			<div class="difficult-help-popup-actions">
 				<van-button class="difficult-help-action-danger" type="danger" block :loading="formLoading" @click="handleTaskAction(6)">退回</van-button>
@@ -134,6 +167,14 @@ layout("/layouts/platform_h5.html"){
 			</div>
 		</div>
 	</info>
+	<van-popup :value="showLevelPicker" position="bottom" :close-on-click-overlay="false">
+		<van-picker
+				show-toolbar
+				:columns="levelColumns"
+				@confirm="onLevelConfirm"
+				@cancel="closeLevelPicker">
+		</van-picker>
+	</van-popup>
 	<van-dialog
 			:value="confirmVisible"
 			title="提示"
@@ -173,6 +214,8 @@ layout("/layouts/platform_h5.html"){
 				skeletonLoading: true,
 
 				formData: {},
+				levelColumns: [],
+				showLevelPicker: false,
 				showApprovalForm: false,
 				formLoading: false,
 				confirmVisible: false,
@@ -229,12 +272,43 @@ layout("/layouts/platform_h5.html"){
 				this.$set(this, "formData", {
 					processTaskId: row.taskId,
 					taskName: row.curTaskName,
-					tf_opinion: ""
+					level: "",
+					money: undefined,
+					tf_sign: "", tf_opinion: ""
 				})
 				this.$refs.infoRef.onOpen(row, row.curTaskName || "帮扶审核")
 			},
 
-			// val 为流程提交类型：1 同意、2 拒绝、6 退回；校验通过后打开历史栈确认框。
+			// 加载困难级别字典并转换为 Vant Picker 所需的 text/value 结构。
+			initLevelDict() {
+				return this.$axios.post("/open/common/dictOptions", {code: "DIFFICULT_LEVEL"}, {h5SkeletonLoading: true}).then((res) => {
+					const levelData = res && res.code === 0 ? res.data : []
+					this.$set(this, "levelColumns", (levelData || []).map((item) => ({
+						text: item.name,
+						value: item.code
+					})))
+				})
+			},
+
+			// 级别选择器作为详情上层弹框，打开时同步增加浏览器历史。
+			openLevelPicker() {
+				if (window.h5HistoryLayerManager && window.h5HistoryLayerManager.open("difficult-help-level-picker")) return
+				this.$set(this, "showLevelPicker", true)
+			},
+
+			closeLevelPicker(afterClose = null) {
+				if (window.h5HistoryLayerManager && window.h5HistoryLayerManager.close("difficult-help-level-picker", afterClose)) return
+				this.$set(this, "showLevelPicker", false)
+				if (typeof afterClose === "function") afterClose()
+			},
+
+			onLevelConfirm(option) {
+				this.closeLevelPicker(() => {
+					this.$set(this.formData, "level", option.value)
+				})
+			},
+
+				// val 为流程提交类型：1 同意、2 拒绝、6 退回；校验通过后打开历史栈确认框。
 			handleTaskAction(val) {
 				this.$refs.formRef.validate()
 					.then(() => {
@@ -260,7 +334,7 @@ layout("/layouts/platform_h5.html"){
 			// 提交流程任务参数，接口成功后清理详情弹框历史并刷新列表。
 			submitTaskAction() {
 				this.$set(this, "formLoading", true)
-				this.$axios.post("/flow/common/executeTask", {
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 					data: JSON.stringify({
 						...this.formData,
 						submitType: this.pendingSubmitType
@@ -345,10 +419,12 @@ layout("/layouts/platform_h5.html"){
 			},
 		},
 		created() {
+			this.initLevelDict()
 			this.initUnion().then(() => this.flushUnits())
 			if (!window.h5HistoryLayerManager) return
 			this.$set(this, "historyLayerUnsubscribe", window.h5HistoryLayerManager.subscribe((stack) => {
 				this.$set(this, "confirmVisible", stack.includes("difficult-help-action-confirm"))
+				this.$set(this, "showLevelPicker", stack.includes("difficult-help-level-picker"))
 			}))
 		},
 		beforeDestroy() {

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js

@@ -25,6 +25,7 @@ const INFO = {
                             <van-cell-group :title="fullScreen ? '' : '基本信息'" :border="!fullScreen">
                                 <van-cell title="填写人姓名">{{ viewData.proxyUserName || '--' }}</van-cell>
                                 <van-cell title="填写人工号">{{ viewData.proxyLoginName || '--' }}</van-cell>
+                                <van-cell title="申请金额（元）">{{ viewData.applyMoney }}</van-cell>
                                 <van-cell title="性别">{{ viewData.sex || '--' }}</van-cell>
                                 <van-cell title="受助人">
                                     {{ viewData.userName || '--' }}{{ viewData.loginName ? '（' + viewData.loginName + '）' : '' }}
@@ -188,11 +189,14 @@ const INFO = {
                                     {{ task.taskFormData && task.taskFormData.userName || '--' }}{{ task.taskFormData && task.taskFormData.loginName ? '（' + task.taskFormData.loginName + '）' : '' }}
                                 </van-cell>
                                 <van-cell title="办理时间">{{ task.finishTime || '--' }}</van-cell>
-                                <van-cell v-if="task.displayName === '校工会审核'" title="审批级别">
-                                    {{ viewData.level || '--' }}
+                                <van-cell v-if="task.taskFormData && task.taskFormData.sign" title="审批签字">
+                                    <img :src="task.taskFormData.sign" style="max-width: 100%; height: 80px; object-fit: contain">
                                 </van-cell>
-                                <van-cell v-if="task.displayName === '校工会审核'" title="审批金额">
-                                    {{ viewData.money ? '￥' + viewData.money : '--' }}
+                                <van-cell v-if="task.taskFormData && task.taskFormData.level != null" title="审批级别">
+                                    {{ task.taskFormData.level }}
+                                </van-cell>
+                                <van-cell v-if="task.taskFormData && task.taskFormData.money != null" title="帮扶金额（元）">
+                                    {{ task.taskFormData.money }}
                                 </van-cell>
                                 <van-cell title="办理结果">
                                     <dict-tag

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html

@@ -388,16 +388,16 @@ layout("/layouts/platform_h5.html"){
 				<van-icon name="eye-o"></van-icon>
 				<span>查看</span>
 			</div>
-			<div class="action-btn" v-if="row.taskKey === 'startTask' || !row.instanceId"
+			<div class="action-btn" v-if="row.createdBy === $store.state.user.id && (row.taskKey === 'startTask' || !row.instanceId)"
 			     @click="onEdit(row)">
 				<van-icon name="edit"></van-icon>
 				<span>编辑</span>
 			</div>
-			<div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+			<div class="action-btn delete" v-if="row.createdBy === $store.state.user.id && row.canRevoke" @click="onRevoke(row)">
 				<van-icon name="revoke"></van-icon>
 				<span>撤回</span>
 			</div>
-			<div class="action-btn delete" v-if="row.taskKey === 'startTask' || !row.instanceId"
+			<div class="action-btn delete" v-if="row.createdBy === $store.state.user.id && (row.taskKey === 'startTask' || !row.instanceId)"
 			     @click="onDelete(row.id)">
 				<van-icon name="delete-o"></van-icon>
 				<span>删除</span>

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html

@@ -110,33 +110,7 @@ layout("/layouts/platform_h5.html"){
 	<info ref="infoRef" page-key="difficult-help-school-union-detail" full-screen>
 		<div v-if="showApprovalForm">
 			<van-form ref="formRef">
-				<section class="difficult-help-info-card">
-					<h2 class="difficult-help-info-card__title">审核信息</h2>
-					<div class="difficult-help-audit-form">
-						<van-field
-								v-model="formData.level"
-								class="difficult-help-audit-select"
-								name="level"
-								label="级别"
-								placeholder="请选择级别"
-								readonly
-								is-link
-								required
-								@click="openLevelPicker"
-								:rules="[{ required: true, message: '请选择级别' }]"
-						></van-field>
-						<van-field
-								v-model="formData.money"
-								class="difficult-help-audit-money"
-								name="money"
-								label="审核金额"
-								placeholder="请输入审核金额"
-								type="number"
-								required
-								:rules="[{ required: true, message: '请输入审核金额' }]"
-						></van-field>
-					</div>
-				</section>
+
 				<section class="difficult-help-info-card">
 					<h2 class="difficult-help-info-card__title">
 						审批意见<span class="difficult-help-audit-card__required">*</span>
@@ -153,6 +127,12 @@ layout("/layouts/platform_h5.html"){
 							show-word-limit
 					></van-field>
 				</section>
+				<section class="difficult-help-info-card">
+					<h2 class="difficult-help-info-card__title">审批签字</h2>
+					<van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+						<template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
+					</van-field>
+				</section>
 			</van-form>
 			<div class="difficult-help-popup-actions">
 				<van-button class="difficult-help-action-danger" type="danger" block :loading="formLoading" @click="handleTaskAction(6)">退回</van-button>
@@ -161,14 +141,7 @@ layout("/layouts/platform_h5.html"){
 			</div>
 		</div>
 	</info>
-	<van-popup :value="showLevelPicker" position="bottom" :close-on-click-overlay="false">
-		<van-picker
-				show-toolbar
-				:columns="levelColumns"
-				@confirm="onLevelConfirm"
-				@cancel="closeLevelPicker">
-		</van-picker>
-	</van-popup>
+
 	<van-dialog
 			:value="confirmVisible"
 			title="提示"
@@ -210,8 +183,6 @@ layout("/layouts/platform_h5.html"){
 				formData: {},
 				showApprovalForm: false,
 				formLoading: false,
-				showLevelPicker: false,
-				levelColumns: [],
 				confirmVisible: false,
 				confirmActionType: "task",
 				pendingSubmitType: null,
@@ -265,43 +236,12 @@ layout("/layouts/platform_h5.html"){
 				this.$set(this, "formData", {
 					processTaskId: row.taskId,
 					taskName: row.curTaskName,
-					money: 0,
 					id: row.id,
-					level: "",
-					tf_opinion: ""
+					tf_sign: "", tf_opinion: ""
 				})
 				this.$refs.infoRef.onOpen(row, row.curTaskName || "帮扶审核")
 			},
 
-			// 加载困难级别字典并转换为 Vant Picker 所需的 text/value 结构。
-			initLevelDict() {
-				return this.$axios.post("/open/common/dictOptions", {code: "DIFFICULT_LEVEL"}, {h5SkeletonLoading: true}).then((res) => {
-					const levelData = res && res.code === 0 ? res.data : []
-					this.$set(this, "levelColumns", (levelData || []).map((item) => ({
-						text: item.name,
-						value: item.code
-					})))
-				})
-			},
-
-			// 级别选择器作为详情上层弹框，打开时同步增加浏览器历史。
-			openLevelPicker() {
-				if (window.h5HistoryLayerManager && window.h5HistoryLayerManager.open("difficult-help-level-picker")) return
-				this.$set(this, "showLevelPicker", true)
-			},
-
-			closeLevelPicker(afterClose = null) {
-				if (window.h5HistoryLayerManager && window.h5HistoryLayerManager.close("difficult-help-level-picker", afterClose)) return
-				this.$set(this, "showLevelPicker", false)
-				if (typeof afterClose === "function") afterClose()
-			},
-
-			onLevelConfirm(option) {
-				this.closeLevelPicker(() => {
-					this.$set(this.formData, "level", option.value)
-				})
-			},
-
 			// val 为流程提交类型：1 同意、2 拒绝、6 退回；校验通过后打开历史栈确认框。
 			handleTaskAction(val) {
 				this.$refs.formRef.validate()
@@ -325,21 +265,14 @@ layout("/layouts/platform_h5.html"){
 				})
 			},
 
-			// 先保存级别和金额，再提交 processTaskId、审批意见及流程提交类型。
 			submitTaskAction() {
 				this.$set(this, "formLoading", true)
-				this.$axios.post("/platform/difficultHelp/schoolUnionApproval/save", {
-					data: JSON.stringify({...this.formData})
-				})
-					.then((saveRes) => {
-						if (!saveRes || saveRes.code !== 0) return null
-						return this.$axios.post("/flow/common/executeTask", {
-							data: JSON.stringify({
-								...this.formData,
-								submitType: this.pendingSubmitType
-							})
-						})
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
+					data: JSON.stringify({
+						...this.formData,
+						submitType: this.pendingSubmitType
 					})
+				})
 					.then((res) => {
 						if (res && res.code === 0) {
 							const afterClose = () => {
@@ -420,11 +353,9 @@ layout("/layouts/platform_h5.html"){
 		},
 		created() {
 			this.initUnion().then(() => this.flushUnits())
-			this.initLevelDict()
 			if (!window.h5HistoryLayerManager) return
 			this.$set(this, "historyLayerUnsubscribe", window.h5HistoryLayerManager.subscribe((stack) => {
 				this.$set(this, "confirmVisible", stack.includes("difficult-help-action-confirm"))
-				this.$set(this, "showLevelPicker", stack.includes("difficult-help-level-picker"))
 			}))
 		},
 		beforeDestroy() {

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html

@@ -129,11 +129,11 @@ layout("/layouts/platform_h5.html"){
 								v-model="formData.money"
 								class="difficult-help-audit-money"
 								name="money"
-								label="审核金额"
-								placeholder="请输入审核金额"
+								label="帮扶金额（元）"
+								placeholder="请输入帮扶金额（元）"
 								type="number"
 								required
-								:rules="[{ required: true, message: '请输入审核金额' }]"
+								:rules="[{ required: true, message: '请输入帮扶金额（元）' }]"
 						></van-field>
 					</div>
 				</section>
@@ -153,6 +153,12 @@ layout("/layouts/platform_h5.html"){
 							show-word-limit
 					></van-field>
 				</section>
+				<section class="difficult-help-info-card">
+					<h2 class="difficult-help-info-card__title">审批签字</h2>
+					<van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+						<template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
+					</van-field>
+				</section>
 			</van-form>
 			<div class="difficult-help-popup-actions">
 				<van-button class="difficult-help-action-danger" type="danger" block :loading="formLoading" @click="handleTaskAction(6)">退回</van-button>
@@ -267,8 +273,8 @@ layout("/layouts/platform_h5.html"){
 					processTaskId: row.taskId,
 					taskName: row.curTaskName,
 					level: "",
-					money: 0,
-					tf_opinion: ""
+					money: undefined,
+					tf_sign: "", tf_opinion: ""
 				})
 				this.$refs.infoRef.onOpen(row, row.curTaskName || "帮扶审核")
 			},
@@ -328,7 +334,7 @@ layout("/layouts/platform_h5.html"){
 			// 提交级别、金额、审批意见和流程提交类型，接口返回统一响应对象。
 			submitTaskAction() {
 				this.$set(this, "formLoading", true)
-				this.$axios.post("/flow/common/executeTask", {
+				this.$axios.post("/platform/difficultHelp/approval/executeTask", {
 					data: JSON.stringify({
 						...this.formData,
 						submitType: this.pendingSubmitType