commit

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

@@ -91,6 +91,8 @@ RoleConstant {
     /*大病基金会员*/
     AID_FUND_MEMBER("大病基金会员"),
 
+    RETIREMENT_WORKPLACE("离退休工作处"),
+
 
     /*爱心扶助基金*/
     LOVE_ASSIST_WORK_GROUP_LEADER("爱心扶助小组组长"),

src/main/java/com/budwk/app/sys/models/Sys_user.java

@@ -297,12 +297,6 @@ public class Sys_user extends BaseModel implements Serializable {
     @Default(value = "0")
     private Boolean welfareMember;
 
-    @Column
-    @Comment("是否大病基金会员")
-    @ColDefine(type = ColType.BOOLEAN)
-    @Default(value = "0")
-    private Boolean aidFundMember;
-
     @Column
     @Comment("家庭主要成员及其工作单位")
     @ColDefine(type = ColType.MYSQL_JSON)
@@ -394,4 +388,34 @@ public class Sys_user extends BaseModel implements Serializable {
     @Comment("openId")
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String openId;
+
+
+    /**
+     * 基金会员
+     */
+    @Column
+    @Comment("是否大病基金会员")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default(value = "0")
+    private Boolean aidFundMember;
+
+    @Column
+    @Comment("基金会员类型")
+    @ColDefine(type = ColType.VARCHAR,width = 10)
+    private String aidFundMemberUserType;
+
+    @Column
+    @Comment("基金会员起扣时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String aidFundDeductTime;
+
+    @Column
+    @Comment("指退休之前的工号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String oldLoginName;
+
+    @Column
+    @Comment("基金会员加入时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date aidFundMemberJoinTime;
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundApplyController.java

@@ -0,0 +1,207 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.sys.views.View_user;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.web.commons.base.Globals;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.mode.AidFundMemberMode;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberChangeRecord;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberPay;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhf
+ * @date 2026/1/15 15:40
+ * @description 基金会员申请
+ */
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/apply")
+@Api("基金会员申请")
+@Ok("json:full")
+@Slf4j
+public class AidFundApplyController {
+
+    @Inject
+    private SysUserService userService;
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/apply/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.apply")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("查询申请状态")
+    @SaCheckPermission("medicalMutualAid.aidFund.apply")
+    public Result canApply() {
+        String aidFundMemberApplyEndTime = Globals.MyConfig.getString("AidFundMemberApplyEndTime");
+        if (StrUtil.isBlank(aidFundMemberApplyEndTime)) {
+            return Result.success(Map.of("disabled", true, "label", "请先配置基金会员申请截止时间！"));
+        }
+
+        Date deadlineEnd = DateUtil.endOfDay(DateUtil.parse(aidFundMemberApplyEndTime, "yyyy-M-d"));
+        if (System.currentTimeMillis() > deadlineEnd.getTime()) {
+            return Result.success(Map.of("disabled", true, "label", "基金会员申请已截止！"));
+        }
+
+        //当前是否有申请的
+        Sys_user user = userService.fetch(SecurityUtil.getUserId());
+        List<Sys_user> userList = userService.query(Cnd.where("idCard", "=", user.getIdCard()));
+
+        List<AidFundMemberChangeRecord> recordList = changeRecordService.query(Cnd.where("userId", "in", userList.stream().map(Sys_user::getId).toList()));
+        List<String> recordIds = recordList.stream().map(AidFundMemberChangeRecord::getId).toList();
+        List<ProcessInstance> instanceList = changeRecordService.dao().query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", recordIds)
+                .and(ProcessInstance::getOperator, "=", SecurityUtil.getUserId())
+                .and(ProcessInstance::getState, "=", ProcessInstanceStateEnum.DOING.getCode()));
+        if (!instanceList.isEmpty()) {
+            return Result.success(Map.of("disabled", true, "label", "您有正在申请的基金会员申请！"));
+        }
+
+
+        //判断是否是首次加入
+        List<String> userIds = new ArrayList<>();
+        userIds.add(SecurityUtil.getUserId());
+
+        //判断是否是工号变更过的用户
+        if (StrUtil.isNotBlank(user.getOldLoginName())) {
+            Sys_user oldUser = userService.fetch(Cnd.where(Sys_user::getLoginname, "=", user.getOldLoginName()));
+            if (null != oldUser) {
+                userIds.add(oldUser.getId());
+            }
+        }
+        int payRecordCount = userService.dao().count(AidFundMemberPay.class, Cnd.where("userid", "in", userIds));
+
+        Boolean aidFundMember = Optional.ofNullable(user.getAidFundMember())
+                .orElse(false);
+        if (aidFundMember == AidFundMemberMode.NONE.getCode()) {
+            if (payRecordCount == 0) {
+                return Result.success(Map.of("disabled", false, "label", "首次申请加入"));
+            }
+            //如果有两个工号并且有一个工号已经是会员就不让他申请了
+            if (userList.size() >= 2) {
+                int size = userList.stream().filter(Sys_user::getAidFundMember).toList().size();
+                if (size > 0) {
+                    return Result.success(Map.of("disabled", true, "label", "请用新工号登陆办理申请业务！"));
+                }
+            }
+            return Result.success(Map.of("disabled", false, "label", "再次申请加入"));
+        }
+        return Result.success(Map.of("disabled", false, "label", "申请退出"));
+    }
+
+
+    @At
+    @ApiOperation("提交申请")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.apply", "h5.medicalMutualAid.aidFund.apply"}, mode = SaMode.OR)
+    @SLog(tag = "基金会员-基金会员申请", msg = "提交申请")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result submit(@Param("data") AidFundMemberChangeRecord aidFundMemberChangeRecord) {
+        aidFundMemberChangeRecord.setUserId(SecurityUtil.getUserId());
+        Sys_user user = dao.fetch(Sys_user.class, SecurityUtil.getUserId());
+        if (StrUtil.isBlank(aidFundMemberChangeRecord.getId())) aidFundMemberChangeRecord.setApplyTime(new Date());
+        if (user.getAidFundMember() == AidFundMemberMode.NORMAL.getCode()) {
+            aidFundMemberChangeRecord.setChangeType("AIDFUND_MEMBER_CHANGE_TYPE_FOUR");
+        } else {
+            aidFundMemberChangeRecord.setChangeType("AIDFUND_MEMBER_CHANGE_TYPE_ONE");
+        }
+        dao.insertOrUpdate(aidFundMemberChangeRecord);
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        args.set(FlowConst.FORM_DATA, aidFundMemberChangeRecord);
+        args.set("aidFundMemberUserType", user.getAidFundMemberUserType());
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("JJHY", aidFundMemberChangeRecord.getId(), SecurityUtil.getUserId(), args);
+
+        // 自动完成第一个申请任务
+        List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
+        for (ProcessTask task : doingTaskList) {
+            flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
+        }
+        return Result.success();
+    }
+
+
+    @At
+    @ApiOperation("查询自己需要缴费多少")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.apply", "h5.medicalMutualAid.aidFund.apply"}, mode = SaMode.OR)
+    public Result getPayMoney(String arrivalAtSchoolDate) {
+        return Result.success(changeRecordService.getPayMoney(arrivalAtSchoolDate, SecurityUtil.getUserId()));
+    }
+
+    @At
+    @ApiOperation("查询自己的缴费记录")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.apply", "h5.medicalMutualAid.aidFund.apply"}, mode = SaMode.OR)
+    public Result getUserPayRecordList(String userId) {
+        return Result.success(changeRecordService.getUserPayRecordList(userId));
+    }
+
+    @At
+    @ApiOperation("查询申请信息")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.apply", "h5.medicalMutualAid.aidFund.apply"}, mode = SaMode.OR)
+    public Result info(String id) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  us.username,
+                  us.loginname,
+                  us.mobile,
+                  us.aidFundMemberUserType,
+                  us.arrivalAtSchoolDate,
+                  us.sex,
+                  us.unitName,
+                  us.unionName
+                FROM
+                  `aid_fund_member_change_record` info
+                  LEFT JOIN vw_user us ON us.id = info.userId
+                WHERE
+                  info.id = '%s'
+                """.formatted(id));
+        View_user user = changeRecordService.fetchVO(sql, View_user.class);
+        return Result.success(user);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundApplyMineController.java

@@ -0,0 +1,145 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+/**
+ * @author zhf
+ * @date 2026/1/16 14:08
+ * @description 我的申请
+ */
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/applyMine")
+@Api("基金会员我的申请")
+@Ok("json:full")
+@Slf4j
+public class AidFundApplyMineController {
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/applyMine/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.applyMine")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.applyMine", "h5.medicalMutualAid.aidFund.applyMine"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "year") Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  us.arrivalAtSchoolDate,
+                  us.mobile,
+                  us.loginname loginName,
+                  us.username userName,
+                  us.unitName,
+                  us.unionName,
+                  us.aidFundMemberUserType,
+                  us.sex,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
+                FROM
+                  aid_fund_member_change_record info
+                  LEFT JOIN vw_user us ON us.id = info.userId
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+
+        cnd.andEX("year(info.applyTime)", "=", year);
+        cnd.and("info.userId", "=", SecurityUtil.getUserId());
+
+        if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        } else {
+            cnd.desc("info.createdAt");
+        }
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = changeRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("删除")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.applyMine", "h5.medicalMutualAid.aidFund.applyMine"}, mode = SaMode.OR)
+    @SLog(tag = "基金会员-我的申请", msg = "删除申请记录")
+    public Result delete(@Param("id") String id) {
+        changeRecordService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("重新提交申请")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.applyMine", "h5.medicalMutualAid.aidFund.applyMine"}, mode = SaMode.OR)
+    public Result submitAgain(@Param("taskId") Long taskId) {
+        Dict dict = Dict.create();
+        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        flowCommonService.executeTask(dict);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundFoundationAuditController.java

@@ -0,0 +1,166 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_home_activity;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2026/1/16 17:26
+ * @description 互管会审核
+ */
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/foundationAudit")
+@Api("基金会员分工会审核")
+@Ok("json:full")
+@Slf4j
+public class AidFundFoundationAuditController {
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/foundationAudit/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.foundationAudit")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.foundationAudit", "h5.medicalMutualAid.aidFund.foundationAudit"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "year") Integer year,
+                           @Param(value = "aidFundMemberUserType") String aidFundMemberUserType,
+                           @Param(value = "unionId") String unionId,
+                           @Param(value = "unitId") String unitId,
+                           @Param(value = "changeType") String changeType,
+                           @Param(value = "approval") Boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  us.arrivalAtSchoolDate,
+                  us.mobile,
+                  us.loginname loginName,
+                  us.username userName,
+                  us.unitName,
+                  us.unionName,
+                  us.aidFundMemberUserType,
+                  us.sex,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN aid_fund_member_change_record info ON info.id = ins.businessNo
+                  LEFT JOIN vw_user us ON us.id = info.userId
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("us.loginname", "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or("us.username", "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        cnd.andEX("YEAR(info.applyTime)", "=", year);
+        cnd.andEX("us.aidFundMemberUserType", "=", aidFundMemberUserType);
+        cnd.andEX("us.unionId", "=", unionId);
+        cnd.andEX("us.unitId", "=", unitId);
+        cnd.andEX("info.changeType", "=", changeType);
+
+        cnd.and("t.taskName", "=", "85c7d148-44f5-4333-b854-ab225357fd3e");
+//        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.applyTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = changeRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+
+        List<NutMap> list = pageVO.getList();
+        for (NutMap map : list) {
+            int money = changeRecordService.getPayMoney(map.getString("arrivalAtSchoolDate"), map.getString("userId"));
+            map.put("money", money);
+        }
+        return Result.success(pageVO);
+    }
+
+    @At
+    @ApiOperation("查询需要缴费多少")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.foundationAudit", "h5.medicalMutualAid.aidFund.foundationAudit"}, mode = SaMode.OR)
+    public Result getPayMoney(String arrivalAtSchoolDate,String userId) {
+        if (StrUtil.isBlank(userId)||StrUtil.isBlank(arrivalAtSchoolDate)){
+            return Result.error("参数错误");
+        }
+        return Result.success(changeRecordService.getPayMoney(arrivalAtSchoolDate, userId));
+    }
+
+    @At
+    @SLog(tag = "基金会员", msg = "互管会审核了一条记录")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.foundationAudit", "h5.medicalMutualAid.aidFund.foundationAudit"}, mode = SaMode.OR)
+    public Result executeTask(@Param("data") String param, String id) {
+        changeRecordService.executeTask(param, id);
+        return Result.success();
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundManageController.java

@@ -0,0 +1,97 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.sys.views.View_user;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.mode.AidFundMemberMode;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPageForm;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+/**
+ * @author zhf
+ * @date 2026/1/17 16:52
+ * @description 基金会员台账
+ */
+
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/manage")
+@Api("基金会员台账")
+@Ok("json:full")
+@Slf4j
+public class AidFundManageController {
+
+    @Inject
+    private SysUserService userService;
+
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/manage/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.manage")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    public Result pageData(AidFundPageForm pageForm) {
+
+        Sql sql = Sqls.create("""
+                select * from vw_user $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            if (AuthUtil.hasRole(RoleConstant.RETIREMENT_WORKPLACE.name())) {
+                cnd.and(Sys_user::getAidFundMemberUserType, "=", "离退休人员");
+            } else {
+                cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId());
+            }
+        }
+        cnd.andEX(Sys_user::getAidFundMemberUserType, "=", pageForm.getAidFundMemberUserType());
+        cnd.andEX(View_user::getUnionId, "=", pageForm.getUnionId());
+        cnd.andEX(View_user::getUnitId, "=", pageForm.getUnitId());
+        sql.setCondition(cnd);
+        cnd.and(Sys_user::getAidFundMember, "=", AidFundMemberMode.NORMAL.getCode());
+
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("loginname", pageForm.getSearchKeyword());
+            seg.orLike("username", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("unitCode");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        sql.setCondition(cnd);
+        Pagination pagination = userService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundRetirementAuditController.java

@@ -0,0 +1,129 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2026/1/17 15:48
+ * @description 离退休审核
+ */
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/retirementAudit")
+@Api("基金会员离退休审核")
+@Ok("json:full")
+@Slf4j
+public class AidFundRetirementAuditController {
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/retirementAudit/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.retirementAudit")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "year") Integer year,
+                           @Param(value = "aidFundMemberUserType") String aidFundMemberUserType,
+                           @Param(value = "changeType") String changeType,
+                           @Param(value = "approval") Boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  us.arrivalAtSchoolDate,
+                  us.mobile,
+                  us.loginname loginName,
+                  us.username userName,
+                  us.unitName,
+                  us.unionName,
+                  us.aidFundMemberUserType,
+                  us.sex,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN aid_fund_member_change_record info ON info.id = ins.businessNo
+                  LEFT JOIN vw_user us ON us.id = info.userId
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("us.loginname", "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or("us.username", "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        cnd.andEX("YEAR(info.applyTime)", "=", year);
+        cnd.andEX("us.aidFundMemberUserType", "=", aidFundMemberUserType);
+        cnd.andEX("info.changeType", "=", changeType);
+
+        cnd.and("t.taskName", "=", "f756c818-6bb7-4f50-b8fa-24390fc7b0b8");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.applyTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = changeRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+
+
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java

@@ -0,0 +1,127 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2026/1/16 14:57
+ * @description 基金会员分工会审核
+ */
+@IocBean
+@At("/platform/medicalMutualAid/aidFund/unionAudit")
+@Api("基金会员分工会审核")
+@Ok("json:full")
+@Slf4j
+public class AidFundUnionAuditController {
+
+    @Inject
+    private AidFundMemberChangeRecordService changeRecordService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/unionAudit/index.html")
+    @SaCheckPermission("medicalMutualAid.aidFund.unionAudit")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.unionAudit", "h5.medicalMutualAid.aidFund.unionAudit"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           @Param(value = "year") Integer year,
+                           @Param(value = "aidFundMemberUserType") String aidFundMemberUserType,
+                           @Param(value = "changeType") String changeType,
+                           @Param(value = "approval") Boolean approval) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  us.arrivalAtSchoolDate,
+                  us.mobile,
+                  us.loginname loginName,
+                  us.username userName,
+                  us.unitName,
+                  us.unionName,
+                  us.aidFundMemberUserType,
+                  us.sex,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN aid_fund_member_change_record info ON info.id = ins.businessNo
+                  LEFT JOIN vw_user us ON us.id = info.userId
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("us.loginname", "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or("us.username", "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        cnd.andEX("YEAR(info.applyTime)", "=", year);
+        cnd.andEX("us.aidFundMemberUserType", "=", aidFundMemberUserType);
+        cnd.andEX("info.changeType", "=", changeType);
+
+        cnd.and("t.taskName", "=", "06ed1d6d-5f96-485f-9150-ed1ef4a082d6");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.applyTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pageVO = changeRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pageVO);
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/mode/AidFundMemberMode.java

@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.mode;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 基金会员mode
+ *
+ * @author 1V
+ * @date 2021/04/16
+ * @since 1.0
+ */
+@Getter
+@AllArgsConstructor
+public enum AidFundMemberMode {
+    /**
+     * 非会员
+     */
+    NONE(false, "非会员"),
+    /**
+     * 正式会员
+     */
+    NORMAL(true, "正式会员");
+
+    /**
+     * 编码
+     */
+    private final Boolean code;
+    /**
+     * 描述
+     */
+    private final String description;
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/model/AidFundMemberChangeRecord.java

@@ -0,0 +1,47 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+/**
+ * @author zhf
+ * @date 2026/1/16 10:44
+ * @description 基金会员变更记录表
+ */
+@Data
+@Comment("基金会员变更记录表")
+@Accessors(chain = true)
+@Table("aid_fund_member_change_record")
+@EqualsAndHashCode(callSuper = true)
+public class AidFundMemberChangeRecord extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("变更类型（dict）")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String changeType;
+
+    @Column
+    @Comment("申请时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date applyTime;
+
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/model/AidFundMemberPay.java

@@ -0,0 +1,67 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * 基金会员缴费记录
+ *
+ * @author 1V
+ * @date 2021/04/19
+ * @since 1.0
+ */
+@Data
+@Comment("基金会员缴费记录")
+@Accessors(chain = true)
+@Table("aid_fund_member_pay")
+@EqualsAndHashCode(callSuper = true)
+public class AidFundMemberPay  extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+    @Column
+    @Comment("缴费金额")
+    @ColDefine(customType = "DECIMAL(10,2)")
+    private Double money;
+
+    @Column
+    @Comment("是否已缴费")
+    @Default("0")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isPayed;
+
+    @Column
+    @Comment("基金会员人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String aidFundMemberUserType;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String personType;
+
+    @Column
+    @Comment("在职状态")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String userState;
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/param/AidFundPageForm.java

@@ -0,0 +1,18 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param;
+
+import com.budwk.app.base.param.PageForm;
+import lombok.Data;
+
+/**
+ * @author zhf
+ * @date 2026/1/17 17:34
+ * @description
+ */
+@Data
+public class AidFundPageForm extends PageForm {
+
+    //基金会员类型
+    private String aidFundMemberUserType;
+    private String unionId;
+    private String unitId;
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberChangeRecordService.java

@@ -0,0 +1,18 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberChangeRecord;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberPay;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+public interface AidFundMemberChangeRecordService extends BaseService<AidFundMemberChangeRecord> {
+
+
+    void executeTask( String param, String id);
+
+
+    int getPayMoney(String arrivalAtSchoolDate,String userId);
+    List<AidFundMemberPay> getUserPayRecordList(String userId);
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberChangeRecordServiceImpl.java

@@ -0,0 +1,121 @@
+package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.mode.AidFundMemberMode;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberChangeRecord;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMemberPay;
+import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
+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.lang.Lang;
+import org.nutz.lang.util.NutMap;
+
+import java.util.*;
+
+/**
+ * @author zhf
+ * @date 2026/1/16 14:31
+ * @description
+ */
+@IocBean(args = {"refer:dao"})
+public class AidFundMemberChangeRecordServiceImpl extends BaseServiceImpl<AidFundMemberChangeRecord> implements AidFundMemberChangeRecordService {
+    public AidFundMemberChangeRecordServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+
+    @Inject
+    private FlowCommonService flowCommonService;
+
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void executeTask(String param, String id) {
+        Dict args = Json.fromJson(Dict.class, param);
+        AidFundMemberChangeRecord changeRecord = fetch(id);
+        if (args.getInt("submitType") == 1) {
+            //如果是通过
+            if (ObjectUtil.equals(args.getStr("changeType"), "AIDFUND_MEMBER_CHANGE_TYPE_ONE")) {
+                //如果是加入基金
+                dao().update(Sys_user.class, Chain.make("arrivalAtSchoolDate", args.getStr("arrivalAtSchoolDate"))
+                                .add("aidFundMember", AidFundMemberMode.NORMAL.getCode()),
+                        Cnd.where(Sys_user::getId, "=", changeRecord.getUserId()));
+            } else {
+                //如果是加入基金
+                dao().update(Sys_user.class, Chain.make("aidFundMember", AidFundMemberMode.NONE.getCode()),
+                        Cnd.where(Sys_user::getId, "=", changeRecord.getUserId()));
+            }
+        }
+        flowCommonService.executeTask(args);
+    }
+
+    @Override
+    public int getPayMoney(String arrivalAtSchoolDate,String userId) {
+        if (StrUtil.isBlank(userId)){
+            userId=SecurityUtil.getUserId();
+        }
+        int money=0;
+        int schoolYear = DateUtil.year(DateUtil.parse(arrivalAtSchoolDate));
+        int applyYear = DateUtil.thisYear();
+
+        List<String> userIds = new ArrayList<>();
+        userIds.add(userId);
+        Sys_user user = dao().fetch(Sys_user.class, userId);
+        if (StrUtil.isNotBlank(user.getOldLoginName())) {
+            Sys_user oldUser = dao().fetch(Sys_user.class,Cnd.where(Sys_user::getLoginname, "=", user.getOldLoginName()));
+            if (null != oldUser) {
+                userIds.add(oldUser.getId());
+            }
+        }
+        List<AidFundMemberPay> historyPays = dao().query(AidFundMemberPay.class, Cnd.where(AidFundMemberPay::getUserId, "in", userIds));
+        if (CollectionUtil.isEmpty(historyPays)) {
+            if (applyYear == schoolYear) {
+                money=180;
+            } else if (schoolYear < 2015) {
+                money=(applyYear - 2015 + 1) * (180 + 18) + 180;
+            } else {
+                //往年需要补的钱
+                int oldMoney = (applyYear - schoolYear) * (180 + 18);
+                money=oldMoney + 180;
+            }
+        } else {
+            //往年需要补的钱 拿到最近一年的缴费记录
+            AidFundMemberPay maxYearPayRecord = historyPays.stream().filter(AidFundMemberPay::getIsPayed).max(Comparator.comparingInt(AidFundMemberPay::getYear)).orElse(null);
+            Integer maxPayYear = maxYearPayRecord.getYear();
+
+            int oldMoney = (applyYear - maxPayYear) * (180 + 18);
+            money=oldMoney + 180;
+        }
+
+        return money;
+    }
+
+    @Override
+    public List<AidFundMemberPay> getUserPayRecordList(String userId) {
+        if (StrUtil.isBlank(userId)){
+            userId=SecurityUtil.getUserId();
+        }
+        Sys_user user = dao().fetch(Sys_user.class, Cnd.where(Sys_user::getId, "=", userId));
+        if (StrUtil.isNotBlank(user.getOldLoginName())) {
+            Sys_user oldUser = dao().fetch(Sys_user.class, Cnd.where(Sys_user::getLoginname, "=", user.getOldLoginName()));
+            List<AidFundMemberPay> payList = dao().query(AidFundMemberPay.class, Cnd.where(AidFundMemberPay::getUserId, "in", Lang.list(userId, oldUser.getId())).desc("year"));
+            return payList;
+        }
+        List<AidFundMemberPay> payList = dao().query(AidFundMemberPay.class, Cnd.where(AidFundMemberPay::getUserId, "=", userId).desc("year"));
+
+        return payList;
+    }
+}

src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java

@@ -85,9 +85,10 @@ public class WelfareListController {
     @ApiOperation("查询福利会员")
     @SaCheckPermission("welfare.list.mange")
     @SLog(tag = "福利名单管理", msg = "管理员删除某个福利会员")
-    public Result delete(String projectId, String userId, String id) {
+    public Result delete(String id) {
+        WelfareList fetch = welfareListService.fetch(id);
         welfareListService.delete(id);
-        welfareListService.dao().clear(WelfareUserSelection.class, Cnd.where("welfareId", "=", projectId).and("selectUserId", "=", userId));
+        welfareListService.dao().clear(WelfareUserSelection.class, Cnd.where("welfareId", "=", fetch.getProjectId()).and("selectUserId", "=", fetch.getUserId()));
         return Result.success();
     }
 

src/main/resources/application-dev.yaml

@@ -21,7 +21,7 @@ jetty:
     #结合ftp使用,或用nginx代理ftp路径
   #staticPath: /Users/wizzer/temp/files
   #开发模式静态资源
-  staticPathLocal: D:/project/zhgh_cug_v4/src/main/resources/static
+  staticPathLocal: E:/projects/zhgh_cug_v4/src/main/resources/static
 
 security:
   tokenName: saToken
@@ -87,7 +87,7 @@ xsssql:
 beetl:
   RESOURCE:
     #本地路径,开发时设置本地路径,便于调试
-    rootLocal: D:/project/zhgh_cug_v4/src/main/resources/views/
+    rootLocal: E:/projects/zhgh_cug_v4/src/main/resources/views/
     root: views/
   DELIMITER_STATEMENT_START: "<!--#"
   DELIMITER_STATEMENT_END: "#-->"

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

@@ -0,0 +1,218 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+
+<div id="app" v-cloak>
+    <div style="max-width: 900px; margin: 0 auto;">
+        <custom-card>
+            <snaker-start slot="header" label="基金会员申请" define_key="JJHY"></snaker-start>
+
+
+            <el-card shadow="never">
+
+                <el-form :model="formData" :rules="formRules" label-suffix="："
+                         label-width="120px"
+                         ref="formRef">
+                    <el-form-item label="姓&emsp;&emsp;名">
+                        <el-input disabled placeholder="请输入内容"
+                                  v-model="formData.userName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="工&emsp;&emsp;号">
+                        <el-input disabled placeholder="请输入内容"
+                                  v-model="formData.loginName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="申请时间" prop="applyTime">
+                        <el-date-picker disabled
+                                        placeholder="选择日期"
+                                        style="width: 100%"
+                                        type="date"
+                                        v-model="formData.applyTime"
+                                        value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="联系方式" prop="mobile">
+                        <el-input placeholder="请输入联系方式"
+                                  v-model="formData.mobile"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="身份证号" prop="idCard">
+                        <el-input maxlength="18" placeholder="请输入身份证号"
+                                  v-model="formData.idCard"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="入校时间" prop="arrivalAtSchoolDate">
+                        <el-input placeholder="请输入入校时间" v-model="formData.arrivalAtSchoolDate"
+                                  disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="基金会员类型" prop="aidFundMemberUserType">
+                        <el-radio-group v-model="formData.aidFundMemberUserType">
+                            <el-radio-button :label="item.code" v-for="item in dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                             :key="item.code">
+                                {{item.name}}
+                            </el-radio-button>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-alert :closable="false" type="error">
+                        温馨提醒：入校时间关联会费缴纳金额，请确认是否正确，若有疑问请联系校工会！另外，务必按您的实际情况选择基金会员类型！
+                    </el-alert>
+                    <el-form-item label="" prop="isRead">
+                        <div style="display: flex">
+                            <el-checkbox v-model="formData.isRead" @change="isReadChange">
+
+                            </el-checkbox>
+                            <div style="cursor: pointer;" @click="isReadClick" class="ml5">
+                                <div style="color: #1e88e5">
+                                    中国地质大学（武汉）教职工重大疾病互助基金管理办法
+                                </div>
+                            </div>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <template slot="footer">
+                <el-button type="primary" @click="openSubmit" :disabled="applyInfo.disabled">
+                    <span>{{applyInfo.label}}</span>
+                </el-button>
+            </template>
+
+
+            <el-dialog :close-on-click-modal="false" title="温馨提醒" :visible.sync="dialogVisible"
+                       width="40%">
+                <pay_record ref="payRecord"></pay_record>
+                <el-alert :closable="false" class="mt10" type="warning" v-if="!$store.state.user.aidFundMember">
+                    本次入会，您需要缴费会费{{payMoney}}元，请详知。
+                </el-alert>
+                <el-row class="mt10" justify="end" type="flex">
+                    <el-button @click="dialogVisible=false">取消</el-button>
+                    <el-button @click="onSubmit" type="primary">提交</el-button>
+                </el-row>
+            </el-dialog>
+        </custom-card>
+    </div>
+</div>
+
+<script nonce="${cspNonce!}">
+    <!--#include("../common/payRecord.js"){}#-->
+    const vue = new Vue({
+        el: '#app',
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE"],
+        mixins: [initTableMixins],
+        data() {
+            return {
+                bizId: GetQueryString("bizId"),
+                taskId: GetQueryString("taskId"),
+                formRules: {
+                    mobile: [{required: true, message: "必填", trigger: ["blur", "change"]}],
+                    idCard: [{required: true, message: "必填", trigger: ["blur", "change"]}],
+                    aidFundMemberUserType: [{required: true, message: "必填", trigger: ["blur", "change"]}],
+                    arrivalAtSchoolDate: [{required: true, message: "必填", trigger: ["blur", "change"]}],
+                },
+                aidFundMemberUserTypeOptions: [],
+                isReadChangeType: true,
+                applyInfo: {
+                    disabled: true,
+                    label: '申请加入'
+                },
+                dialogVisible: false,
+                payMoney: 0,
+                payRecordsDialogTitle: "",
+                payRecordList: []
+            }
+        },
+        components: {
+            'pay_record': PAY_RECORD,
+        },
+        methods: {
+            getPayMoney() {
+                this.$axios.post('/platform/medicalMutualAid/aidFund/apply/getPayMoney', {arrivalAtSchoolDate: this.formData.arrivalAtSchoolDate}).then(resp => {
+                    if (resp.code === 0) {
+                        this.payMoney = resp.data
+                    }
+                })
+            },
+            isReadClick() {
+                this.isReadChangeType = false
+                this.$set(this.formData, 'isRead', true)
+                this.$commonUtil.previewFile({
+                    suffix: "pdf",
+                    downloadPath: "/platform/sys/file/download?id=orpgde84uggjmpflbob83tadan",
+                    name: "中国地质大学（武汉）教职工重大疾病互助基金管理办法.pdf",
+                    id: "orpgde84uggjmpflbob83tadan"
+                })
+            },
+            isReadChange() {
+                if (this.isReadChangeType) {
+                    this.$set(this.formData, 'isRead', false)
+                    this.$alert('请阅读《教职工重大疾病互助基金管理办法》的通知文件', '温馨提醒', {
+                        confirmButtonText: '确定',
+                    })
+                    return
+                }
+            },
+            openSubmit() {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        if (!this.formData.isRead) {
+                            this.$alert('请阅读《教职工重大疾病互助基金管理办法》的通知', '温馨提醒', {
+                                confirmButtonText: '确定',
+                            })
+                            return
+                        }
+                        this.getPayMoney()
+                        this.dialogVisible = true
+                        this.$nextTick(() => {
+                            this.$refs.payRecord.getUserPayRecordList()
+                        })
+                    }
+                })
+            },
+            onSubmit() {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/medicalMutualAid/aidFund/apply/submit", {
+                        data: JSON.stringify(this.formData)
+                    }).then(res => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.dialogVisible = false
+                            commonUtil.pjaxPush("/platform/medicalMutualAid/aidFund/applyMine")
+                        }
+                    })
+                })
+            },
+            canApply() {
+                this.$axios.post('/platform/medicalMutualAid/aidFund/apply/canApply').then(resp => {
+                    if (resp.code === 0) {
+                        this.applyInfo = resp.data
+                    }
+                })
+            },
+            initData() {
+                this.canApply()
+                this.$set(this.formData, "userName", this.$store.state.user.username)
+                this.$set(this.formData, "loginName", this.$store.state.user.loginname)
+                this.$set(this.formData, "mobile", this.$store.state.user.mobile)
+                this.$set(this.formData, "idCard", this.$store.state.user.idCard)
+                this.$set(this.formData, "aidFundMemberUserType", this.$store.state.user.aidFundMemberUserType)
+                if (this.$store.state.user.arrivalAtSchoolDate) {
+                    this.$set(this.formData, "arrivalAtSchoolDate", this.$moment(this.$store.state.user.arrivalAtSchoolDate).format("YYYY-MM-DD"))
+                }
+                this.$set(this.formData, "applyTime", this.$moment(new Date()).format("YYYY-MM-DD"))
+            }
+        },
+        created() {
+            this.initData()
+        }
+    })
+</script>
+
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/applyMine/index.html

@@ -0,0 +1,151 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy">
+                    </el-date-picker>
+                </search-item>
+
+            </search>
+        </el-card>
+
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请记录">
+            </table-tool>
+
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
+                      ref="table" row-key="id" style="width: 100%">
+                <el-table-column :index="indexMethod" header-align="center" label="序号"
+                                 type="index" width="60px"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='aidFundMemberUserType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                  :value="row.aidFundMemberUserType"></dict-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='changeType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_CHANGE_TYPE"
+                                  :value="row.changeType"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="{row}">
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onFinishTask(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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        </el-card>
+    </guava>
+</div>
+
+<script nonce="${cspNonce!}">
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE", "AIDFUND_MEMBER_CHANGE_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+                tableColumns: [
+                    {prop: "loginName", label: "工号", sortable: true},
+                    {prop: "userName", label: "姓名", sortable: true},
+                    {prop: "sex", label: "性别", sortable: true},
+                    {prop: "arrivalAtSchoolDate", label: "入校时间"},
+                    {prop: "mobile", label: "电话"},
+                    {prop: "unitName", label: "所属单位"},
+                    {prop: "unionName", label: "所属工会"},
+                    {prop: "aidFundMemberUserType", label: "基金会员类型"},
+                    {prop: "changeType", label: "变更类型"},
+                    {prop: "applyTime", label: "申请日期"},
+                    {prop: "taskName", label: "当前节点"},
+                    {prop: "instanceState", label: "流程状态"}
+                ],
+            }
+        },
+        methods: {
+            onFinishTask(row){
+                this.$confirm("您确定要重新提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/medicalMutualAid/aidFund/applyMine/submitAgain", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            onDelete(id) {
+                this.$confirm("您确定要取消申请吗？取消后将不能撤回", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/medicalMutualAid/aidFund/applyMine/delete", {id}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/common/aidFundInfo.js

@@ -0,0 +1,6 @@
+const AID_FUND_INFO = {
+    template: /*language=HTML*/
+        `
+            
+        `
+}

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/common/applyInfo.js

@@ -0,0 +1,97 @@
+const APPLY_INFO = {
+    template: /*language=HTML*/ `
+        <div>
+            <div class="process-title">申请信息
+                <el-link type="primary" @click="openChart">点击查看流程图</el-link>
+            </div>
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="申报人">{{viewData.username}}</el-descriptions-item>
+                <el-descriptions-item label="工号">{{viewData.loginname}}</el-descriptions-item>
+                <el-descriptions-item label="联系方式">{{viewData.mobile}}</el-descriptions-item>
+                <el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
+                <el-descriptions-item label="入校时间">{{$moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD')}}</el-descriptions-item>
+                <el-descriptions-item label="所在单位">{{viewData.unitName}}</el-descriptions-item>
+                <el-descriptions-item label="所在工会">{{viewData.unionName}}</el-descriptions-item>
+            </el-descriptions>
+
+
+            <template v-for="task in doneTasks">
+                <div class="task-panel mt10">
+                    <div class="process-title">{{ task.displayName }}</div>
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
+                                     v-if="task.ext.isFirstTaskNode">
+                        <el-descriptions-item label="申请用户">{{ task.ext.initiatorName
+                            }}({{task.ext.initiatorAccount}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+                    </el-descriptions>
+
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
+                        <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
+                            }}({{task.taskFormData.loginName}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+
+                        <template v-if="task.taskFormData.tf_money">
+                            <el-descriptions-item label="审批金额">{{ '￥' + task.taskFormData.tf_money }}
+                            </el-descriptions-item>
+                        </template>
+
+                        <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
+                            task.taskFormData.opinion }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </template>
+
+            <slot></slot>
+
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
+        </div>
+    `,
+    store,
+    dicts: ["AIDFUND_MEMBER_USER_TYPE", "AIDFUND_MEMBER_CHANGE_TYPE"],
+    data() {
+        return {
+            viewData: {},
+            doneTasks: [],
+            row: null,
+        }
+    },
+    methods: {
+        // 打开
+        onOpen(row) {
+            this.row = row
+            this.info()
+            this.getDoneTasks()
+        },
+        // 获取申请信息
+        info() {
+            this.$axios.post("/platform/medicalMutualAid/aidFund/apply/info", {id: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+        // 获取已办任务审批记录
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
+        // 查看流程图
+        openChart() {
+            this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
+        }
+    },
+}

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/common/payRecord.js

@@ -0,0 +1,40 @@
+const PAY_RECORD = {
+    template: /*language=HTML*/
+        `
+            <div>
+                <el-table :data="payRecordList" row-key="id" style="width: 100%"max-height="300">
+                    <el-table-column label="序号"
+                                     type="index"></el-table-column>
+
+                    <el-table-column label="缴费年份" prop="year"></el-table-column>
+
+                    <el-table-column label="缴费金额" prop="money">
+                        <template scope="{row:{money}}">
+                            <el-tag>{{ money }}</el-tag>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="是否扣款"prop="isPayed">
+                        <template scope="{row:{isPayed}}">
+                            <el-tag v-if="isPayed" type="success">已扣款</el-tag>
+                            <el-tag v-else-if="!isPayed" type="info">未扣款</el-tag>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        `,
+    data() {
+        return {
+            payRecordList: [],
+        }
+    },
+    methods: {
+        getUserPayRecordList() {
+            this.$axios.post('/platform/medicalMutualAid/aidFund/apply/getUserPayRecordList').then(resp => {
+                if (resp.code === 0) {
+                    this.payRecordList = resp.data
+                }
+            })
+        },
+    }
+}

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/foundationAudit/index.html

@@ -0,0 +1,314 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy">
+                    </el-date-picker>
+                </search-item>
+
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+
+                <search-item label="会员类型">
+                    <dict-select v-model="pageForm.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+                <search-item label="变更类型">
+                    <dict-select v-model="pageForm.changeType" code="AIDFUND_MEMBER_CHANGE_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+                <search-item label="所属工会">
+                    <el-select @change="unionChange" clearable filterable style="width: 100%"
+                               placeholder="请选择所属工会" v-model="pageForm.unionId">
+                        <el-option
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                                v-for="item in unionOptions">
+                        </el-option>
+                    </el-select>
+                </search-item>
+
+                <search-item label="所属单位">
+                    <el-select @change="doSearch" clearable filterable style="width: 100%"
+                               placeholder="请选择所属单位" v-model="pageForm.unitId">
+                        <el-option
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                                v-for="item in unitOptions">
+                        </el-option>
+                    </el-select>
+                </search-item>
+
+            </search>
+        </el-card>
+
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请记录">
+                <el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.approval">
+                    <el-radio-button label="true">已审核</el-radio-button>
+                    <el-radio-button label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
+                      ref="table" row-key="id" style="width: 100%">
+                <el-table-column :index="indexMethod" header-align="center" label="序号"
+                                 type="index" width="60px"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :key="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='aidFundMemberUserType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                  :value="row.aidFundMemberUserType"></dict-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='changeType'">
+                        <template v-if="row.changeType==='AIDFUND_MEMBER_CHANGE_TYPE_ONE'">
+                            <el-tag type="success">
+                                <dict-tag :options="dict.type.AIDFUND_MEMBER_CHANGE_TYPE"
+                                          :value="row.changeType"></dict-tag>
+                            </el-tag>
+                        </template>
+                        <template v-else>
+                            <el-tag type="danger">
+                                <dict-tag :options="dict.type.AIDFUND_MEMBER_CHANGE_TYPE"
+                                          :value="row.changeType"></dict-tag>
+                            </el-tag>
+                        </template>
+
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='money'">
+                        <template v-if="row.changeType==='AIDFUND_MEMBER_CHANGE_TYPE_ONE'">
+                            <el-tag>{{row.money}}</el-tag>
+                        </template>
+                        <template v-else></template>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <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-item label="审核状态" prop="submitType"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            审核状态:
+                            <el-radio-group v-model="formData.submitType">
+                                <el-radio-button :label="2">拒绝</el-radio-button>
+                                <el-radio-button :label="1">通过</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-row :gutter="20"
+                                v-if="formData.submitType===1
+                                &&formData.changeType==='AIDFUND_MEMBER_CHANGE_TYPE_ONE'">
+                            <el-col :span="12">
+                                <el-form-item label="入校时间" prop="arrivalAtSchoolDate"
+                                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                    入校时间:
+                                    <el-date-picker
+                                            :picker-options="pickerOptions"
+                                            @change="getPayMoney"
+                                            placeholder="选择日期"
+                                            type="date"
+                                            v-model="formData.arrivalAtSchoolDate"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="缴纳费用" prop="money">
+                                    缴纳费用:
+                                    <el-input readonly v-model="formData.money"></el-input>
+                                </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>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(formData.submitType)" size="small" type="primary">提交
+                        </el-button>
+                        <!--<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>-->
+                    </el-row>
+                </div>
+            </info>
+        </template>
+    </guava>
+</div>
+
+<script nonce="${cspNonce!}">
+
+    <!--#include("../common/applyInfo.js"){}#-->
+
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE", "AIDFUND_MEMBER_CHANGE_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY"),
+                    approval: false
+                },
+                tableColumns: [
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "sex", label: "性别"},
+                    {prop: "arrivalAtSchoolDate", label: "入校时间"},
+                    {prop: "unitName", label: "所属单位"},
+                    {prop: "unionName", label: "所属工会"},
+                    {prop: "aidFundMemberUserType", label: "基金会员类型"},
+                    {prop: "changeType", label: "变更类型"},
+                    {prop: "applyTime", label: "申请日期"},
+                    {prop: "curTaskName", label: "当前节点"},
+                    {prop: "instanceState", label: "流程状态"}
+                ],
+                showApprovalForm: false,
+                unionOptions: [],
+                unitOptions: [],
+                pickerOptions: {
+                    disabledDate(date) {
+                        return date.getTime() > new Date().getTime()
+                    }
+                },
+            }
+        },
+        components: {
+            'info': APPLY_INFO,
+        },
+        methods: {
+            getPayMoney() {
+                this.$axios.post('/platform/medicalMutualAid/aidFund/foundationAudit/getPayMoney', {
+                    arrivalAtSchoolDate: this.formData.arrivalAtSchoolDate,
+                    userId: this.formData.userId
+                }).then(resp => {
+                    if (resp.code === 0) {
+                        this.$set(this.formData, 'money', resp.data)
+                    }
+                })
+            },
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        id: row.id,
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName,
+                        arrivalAtSchoolDate: row.arrivalAtSchoolDate,
+                        userId: row.userId,
+                        applyTime: row.applyTime,
+                        changeType: row.changeType
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                    this.getPayMoney()
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            this.$axios.post("/platform/medicalMutualAid/aidFund/foundationAudit/executeTask", {
+                                data: JSON.stringify({
+                                    ...this.formData,
+                                    submitType: val
+                                }), id: this.formData.id
+                            }).then((res) => {
+                                if (res.code === 0) {
+                                    this.$refs.guava.index()
+                                    this.$message.success(res.msg)
+                                    this.doSearch()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            async unionChange(val) {
+                this.pageForm.unitId = null
+                this.unitOptions = await this.$businessTool.listUnit(val)
+                this.doSearch()
+            },
+        },
+        async created() {
+            this.pageData()
+            this.unitOptions = await this.$businessTool.listUnit()
+            this.unionOptions = await this.$businessTool.listUnion()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/manage/index.html

@@ -0,0 +1,161 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+
+                <search-item label="会员类型">
+                    <dict-select v-model="pageForm.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+
+            </search>
+        </el-card>
+
+        <el-card shadow="never" class="mt10">
+            <table-tool label="基金会员">
+
+            </table-tool>
+
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
+                      ref="table" row-key="id" style="width: 100%">
+                <el-table-column :index="indexMethod" header-align="center" label="序号"
+                                 type="index" width="60px"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='aidFundMemberUserType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                  :value="row.aidFundMemberUserType"></dict-tag>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #edit>
+            <info ref="infoRef">
+            </info>
+        </template>
+    </guava>
+</div>
+
+<script nonce="${cspNonce!}">
+
+    <!--#include("../common/aidFundInfo.js"){}#-->
+
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY"),
+                    approval: false
+                },
+                tableColumns: [
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "sex", label: "性别"},
+                    {prop: "arrivalAtSchoolDate", label: "入校时间"},
+                    {prop: "unitName", label: "所属单位"},
+                    {prop: "unionName", label: "所属工会"},
+                    {prop: "aidFundMemberUserType", label: "基金会员类型"},
+                    {prop: "aidFundMemberJoinTime", label: "加入时间"},
+                ],
+                showApprovalForm: false
+            }
+        },
+        components: {
+            'info': AID_FUND_INFO,
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/retirementAudit/index.html

@@ -0,0 +1,204 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy">
+                    </el-date-picker>
+                </search-item>
+
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+
+                <search-item label="会员类型">
+                    <dict-select v-model="pageForm.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+                <search-item label="变更类型">
+                    <dict-select v-model="pageForm.changeType" code="AIDFUND_MEMBER_CHANGE_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+            </search>
+        </el-card>
+
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请记录">
+                <el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.approval">
+                    <el-radio-button label="true">已审核</el-radio-button>
+                    <el-radio-button label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
+                      ref="table" row-key="id" style="width: 100%">
+                <el-table-column :index="indexMethod" header-align="center" label="序号"
+                                 type="index" width="60px"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='aidFundMemberUserType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                  :value="row.aidFundMemberUserType"></dict-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='changeType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_CHANGE_TYPE"
+                                  :value="row.changeType"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <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-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>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </info>
+        </template>
+    </guava>
+</div>
+
+<script nonce="${cspNonce!}">
+
+    <!--#include("../common/applyInfo.js"){}#-->
+
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE", "AIDFUND_MEMBER_CHANGE_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY"),
+                    approval: false
+                },
+                tableColumns: [
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "sex", label: "性别"},
+                    {prop: "arrivalAtSchoolDate", label: "入校时间"},
+                    {prop: "unitName", label: "所属单位"},
+                    {prop: "unionName", label: "所属工会"},
+                    {prop: "aidFundMemberUserType", label: "基金会员类型"},
+                    {prop: "changeType", label: "变更类型"},
+                    {prop: "applyTime", label: "申请日期"},
+                    {prop: "curTaskName", label: "当前节点"},
+                    {prop: "instanceState", label: "流程状态"}
+                ],
+                showApprovalForm: false
+            }
+        },
+        components: {
+            'info': APPLY_INFO,
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/unionAudit/index.html

@@ -0,0 +1,204 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy">
+                    </el-date-picker>
+                </search-item>
+
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"
+                              @keyup.enter.native="doSearch">
+                    </el-input>
+                </search-item>
+
+                <search-item label="会员类型">
+                    <dict-select v-model="pageForm.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+                <search-item label="变更类型">
+                    <dict-select v-model="pageForm.changeType" code="AIDFUND_MEMBER_CHANGE_TYPE"
+                                 style="width: 100%"></dict-select>
+                </search-item>
+
+            </search>
+        </el-card>
+
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请记录">
+                <el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.approval">
+                    <el-radio-button label="true">已审核</el-radio-button>
+                    <el-radio-button label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
+                      ref="table" row-key="id" style="width: 100%">
+                <el-table-column :index="indexMethod" header-align="center" label="序号"
+                                 type="index" width="60px"></el-table-column>
+                <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='aidFundMemberUserType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_USER_TYPE"
+                                  :value="row.aidFundMemberUserType"></dict-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='changeType'">
+                        <dict-tag :options="dict.type.AIDFUND_MEMBER_CHANGE_TYPE"
+                                  :value="row.changeType"></dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <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-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>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </info>
+        </template>
+    </guava>
+</div>
+
+<script nonce="${cspNonce!}">
+
+    <!--#include("../common/applyInfo.js"){}#-->
+
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        store,
+        dicts: ["AIDFUND_MEMBER_USER_TYPE", "AIDFUND_MEMBER_CHANGE_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY"),
+                    approval: false
+                },
+                tableColumns: [
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "sex", label: "性别"},
+                    {prop: "arrivalAtSchoolDate", label: "入校时间"},
+                    {prop: "unitName", label: "所属单位"},
+                    {prop: "unionName", label: "所属工会"},
+                    {prop: "aidFundMemberUserType", label: "基金会员类型"},
+                    {prop: "changeType", label: "变更类型"},
+                    {prop: "applyTime", label: "申请日期"},
+                    {prop: "curTaskName", label: "当前节点"},
+                    {prop: "instanceState", label: "流程状态"}
+                ],
+                showApprovalForm: false
+            }
+        },
+        components: {
+            'info': APPLY_INFO,
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html

@@ -156,12 +156,12 @@ layout("/layouts/platform.html"){
         computed: {
             welfareOptions() {
                 if (this.pageForm.projectId) {
-                    return this.projectOptions.find((item) => item.id === this.pageForm.projectId).options
+                    return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.options
                 }
                 return []
             },
             provideMode() {
-                return this.projectOptions.find((item) => item.id === this.pageForm.projectId).provideMode
+                return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.provideMode
             }
         },
         methods: {