Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java

@@ -0,0 +1,108 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingActService;
+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.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 javax.validation.Valid;
+
+/**
+ * @ClassName UnionReimburse
+ * @Author hongqiwei
+ * @Date 2025/9/19 14:45
+ * @Version 1.0
+ * @Description TODO
+ */
+
+@IocBean
+@At("/platform/cadreTraining/activity")
+@Api("培训活动")
+@Ok("json:full")
+@Slf4j
+public class CadreTrainingActController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private CadreTrainingActService cadreTrainingActService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/dayofficework/cadreTraining/activity/index.html")
+    @SaCheckPermission("cadreTraining.activity")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/cadreTraining/activity/index.html")
+    @SaCheckPermission("h5.cadreTraining.activity")
+    public void h5Index() {
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.activity")
+    @ApiOperation("活动列表")
+    public Result pageData(@Valid PageForm pageForm, Integer year) {
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("year(signUpStartTime)", "=", year);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.where().andLike(CadreTrainingAct::getName, pageForm.getSearchKeyword());
+        }
+        Pagination pagination = cadreTrainingActService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.activity")
+    @ApiOperation("添加活动")
+    @SLog(tag = "干部培训添加活动", msg = "活动名称:${args[0].name}")
+    public Result insert(@Valid @Param("cadreTrainingAct") CadreTrainingAct cadreTrainingAct) {
+        cadreTrainingActService.insert(cadreTrainingAct);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.activity")
+    @ApiOperation("编辑活动")
+    @SLog(tag = "干部培训编辑活动", msg = "活动名称:${args[0].name}")
+    public Result update(@Valid @Param("cadreTrainingAct") CadreTrainingAct cadreTrainingAct) {
+        cadreTrainingActService.update(cadreTrainingAct);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.activity")
+    @ApiOperation("删除活动")
+    @SLog(tag = "干部培训删除活动", msg = "活动名称:${args[0]}")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result delete(@Param("id") String id) {
+        cadreTrainingActService.delete(id);
+        dao.clear(CadreTrainingAct.class, Cnd.where(CadreTrainingAct::getId, "=", id));
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.activity")
+    @ApiOperation("查询单个活动信息")
+    public Result get(@Param("id") String id) {
+        CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id);
+        return Result.success().addData(cadreTrainingAct);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java

@@ -0,0 +1,211 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingSignUpService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingActService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.vo.CadreTrainingCollectExcelVO;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
+import com.budwk.app.zhgh.staffbenefit.maternityLeave.vo.MaternityLeaveCollectExcelVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+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.entity.Record;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author : hongqiwei
+ * @description :
+ * @createDate : 2025/9/22 19:01
+ */
+
+@IocBean
+@At("/platform/cadreTraining/collect")
+@Ok("json:full")
+@Api(tags = "查询统计")
+public class CadreTrainingCollectController {
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private CadreTrainingSignUpService cadreTrainingSignUpService;
+    @Inject
+    private CadreTrainingActService cadreTrainingActService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/dayofficework/cadreTraining/collect/index.html")
+    @SaCheckPermission("cadreTraining.collect")
+    public void index() {
+    }
+
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/cadreTraining/collect/index.html")
+    @SaCheckPermission("h5.cadreTraining.collect")
+    public void h5Index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           String activityId,
+                           String unionId,
+                           String unitId,
+                           String userName,
+                           String sex) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ct.name,
+                  ct.signUpStartTime,
+                  ct.signUpEndTime,
+                  ct.startTime,
+                  ct.endTime,
+                  ct.notice,
+                  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' AND taskState in (10,20)) AS startTaskId
+                FROM
+                  cadre_training_signup info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN `cadre_training` ct ON ct.id = info.cadreTrainingActId
+                  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();
+
+        // 活动ID查询条件
+        cnd.and("info.cadreTrainingActId", "=", activityId);
+
+        // 工会、单位名称查询条件
+        cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.unitId", "=", unitId);
+
+        // 性别查询条件
+        cnd.andEX("info.sex", "=", sex);
+
+        // 姓名查询条件
+        if (StrUtil.isNotBlank(userName)) {
+            cnd.and("info.userName", "like", "%" + userName + "%");
+        }
+
+        // 只查询流程实例状态为20的数据（已完成状态）
+        cnd.and("ins.state", "=", 20);
+
+        cnd.desc("info.applyTime");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = cadreTrainingSignUpService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @ApiOperation("获取活动列表")
+    @SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
+    public Result getActivityList(Integer year) {
+        Cnd cnd = Cnd.NEW();
+        // 添加年度筛选条件，基于报名开始时间
+        if (year != null) {
+            cnd.andEX("year(signUpStartTime)", "=", year);
+        }
+        // 按报名开始时间倒序排列（最新的活动在前）
+        cnd.desc("signUpStartTime");
+        List<CadreTrainingAct> list = cadreTrainingActService.query(cnd);
+        return Result.success(list);
+    }
+
+    @At
+    @ApiOperation("删除")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
+    @SLog(tag = "删除干部培训报名", msg = "删除干部培训报名")
+    public Result delete(@Param("id") String id) {
+        cadreTrainingSignUpService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
+    @ApiOperation("导出培训活动报名人表")
+    public void onExport(@Param(value = "activityId") String activityId,
+                         @Param(value = "unionId") String unionId,
+                         @Param(value = "unitId") String unitId,
+                         @Param(value = "userName") String userName,
+                         @Param(value = "sex") String sex,
+                         HttpServletResponse response) {
+        //查询审核通过的数据
+        Sql sql = Sqls.create("""
+            SELECT
+                info.*,
+                ct.name AS activityName,
+                ins.state instanceState
+            FROM
+                cadre_training_signup info
+            LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+            LEFT JOIN `cadre_training` ct ON ct.id = info.cadreTrainingActId
+            $condition
+            """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(userName)) {
+            cnd.and("info.userName", "like", "%" + userName + "%");
+        }
+        // 活动ID查询条件
+        cnd.and("info.cadreTrainingActId", "=", activityId);
+        cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.unitId", "=", unitId);
+        cnd.andEX("info.sex", "=", sex);
+        cnd.and("ins.state", "=", 20);
+
+        cnd.desc("info.applyTime");
+        sql.setCondition(cnd);
+        List<CadreTrainingCollectExcelVO> list = cadreTrainingSignUpService.listVO(sql, CadreTrainingCollectExcelVO.class);
+
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF);
+
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, CadreTrainingCollectExcelVO.class, list);
+        CommonDownloadUtil.download("培训报名表.xlsx", workbook, response);
+    }
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingMineController.java

@@ -0,0 +1,126 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingActService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingSignUpService;
+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.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+
+/**
+ * @author : hongqiwei
+ * @description :
+ * @createDate : 2025/9/22 15:46
+ */
+
+@IocBean
+@At("/platform/cadreTraining/mine")
+@Api("我的报名")
+@Ok("json:full")
+@Slf4j
+public class CadreTrainingMineController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private CadreTrainingSignUpService cadreTrainingSignUpService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/dayofficework/cadreTraining/mine/index.html")
+    @SaCheckPermission("cadreTraining.mine")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/cadreTraining/mine/index.html")
+    @SaCheckPermission("h5.cadreTraining.mine")
+    public void h5Index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"cadreTraining.mine", "h5.cadreTraining.mine"}, mode = SaMode.OR)
+    public Result pageData(@Valid PageForm pageForm, Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ct.name,
+                  ct.signUpStartTime,
+                  ct.signUpEndTime,
+                  ct.startTime,
+                  ct.endTime,
+                  ct.notice,
+                  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
+                  cadre_training_signup info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                  LEFT JOIN `cadre_training` ct ON ct.id = info.cadreTrainingActId
+                  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);
+        // 名称搜索条件
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.where().andLike(CadreTrainingAct::getName, pageForm.getSearchKeyword());
+        }
+        cnd.desc("info.applyTime");
+        cnd.and("info.userId", "=", SecurityUtil.getUserId());
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = cadreTrainingSignUpService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @ApiOperation("删除")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"cadreTraining.mine", "h5.cadreTraining.mine"}, mode = SaMode.OR)
+    @SLog( tag = "删除工会报销", msg = "删除工会报销")
+    public Result delete(@Param("id") String id) {
+        cadreTrainingSignUpService.delete(id);
+        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        return Result.success();
+    }
+}
+

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java

@@ -0,0 +1,139 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.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.engine.FlowEngine;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingSignUpService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+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 java.util.List;
+
+/**
+ * @author : hongqiwei
+ * @description :
+ * @createDate : 2025/9/22 15:47
+ */
+
+@IocBean
+@At("/platform/cadreTraining/schoolAudit")
+@Api("校工会审核")
+@Ok("json:full")
+@Slf4j
+public class CadreTrainingSchoolAuditController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private CadreTrainingSignUpService cadreTrainingSignUpService;
+    @At("")
+    @Ok("beetl:/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html")
+    @SaCheckPermission("cadreTraining.schoolAudit")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/cadreTraining/schoolAudit/index.html")
+    @SaCheckPermission("h5.cadreTraining.schoolAudit")
+    public void h5Index() {
+    }
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"cadreTraining.schoolAudit", "h5.cadreTraining.schoolAudit"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           boolean approval,
+                           Integer year,
+                           String activityId,
+                           String unionId,
+                           String unitId,
+                           String userName,
+                           String sex) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ct.name,
+                  ct.signUpStartTime,
+                  ct.signUpEndTime,
+                  ct.startTime,
+                  ct.endTime,
+                  ct.notice,
+                  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 cadre_training_signup info ON info.id = ins.businessNo
+                  LEFT JOIN `cadre_training` ct ON ct.id = info.cadreTrainingActId
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "14347d9f-125f-4b8c-bd6e-97cce1e40e3f");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        // 活动ID查询条件
+        cnd.andEX("info.cadreTrainingActId", "=", activityId);
+
+        // 工会、单位名称查询条件
+        cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.unitId", "=", unitId);
+
+        // 性别查询条件
+        cnd.andEX("info.sex", "=", sex);
+
+        // 姓名查询条件
+        if (StrUtil.isNotBlank(userName)) {
+            cnd.and("info.userName", "like", "%" + userName + "%");
+        }
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.applyTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = cadreTrainingSignUpService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+}
+

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java

@@ -0,0 +1,120 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.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.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+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.ProcessSubmitTypeEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingSignUp;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingActService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingSignUpService;
+import com.budwk.app.zhgh.dayofficework.rest.models.RestActSignUp;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@IocBean
+@At("/platform/cadreTraining/branchUnionSignUp")
+@Ok("json:full")
+@Api(tags = "干部培训分工会活动报名")
+public class CadreTrainingSignUpController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private FlowEngine flowEngine;
+    @Inject
+    private CadreTrainingActService cadreTrainingActService;
+    @Inject
+    private CadreTrainingSignUpService cadreTrainingSignUpService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/dayofficework/cadreTraining/signUp/index.html")
+    @SaCheckPermission("cadreTraining.branchUnionSignUp")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("cadreTraining.branchUnionSignUp")
+    @ApiOperation("分页查询")
+    public Result pageData(@Valid PageForm pageForm,Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  cadre_training info
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("year(signUpStartTime)", "=", year);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.where().andLike(CadreTrainingAct::getName, pageForm.getSearchKeyword());
+        }
+        sql.setCondition(cnd);
+        Pagination pagination = cadreTrainingActService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @ApiOperation("提交申请")
+    @SaCheckPermission(value = {"cadreTraining.branchUnionSignUp", "h5.cadreTraining.branchUnionSignUp"}, mode = SaMode.OR)
+    public Result submit(@Param("data") CadreTrainingSignUp cadreTrainingSignUp) {
+        if (StrUtil.isBlank(cadreTrainingSignUp.getId())) cadreTrainingSignUp.setApplyTime(DateUtil.now());
+
+        dao.insertOrUpdate(cadreTrainingSignUp);
+        // 开启流程实例
+        Dict args = Dict.create();
+        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
+        args.set(FlowConst.FORM_DATA, cadreTrainingSignUp);
+        ProcessInstance instance = flowEngine.startProcessInstanceByKey("GBPX", cadreTrainingSignUp.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
+    @SaCheckPermission("cadreTraining.branchUnionSignUp")
+    @ApiOperation("查询报名用户")
+    public Result listSignUser(@Param("activityId") String activityId) {
+        List<CadreTrainingSignUp> list = dao.query(CadreTrainingSignUp.class, Cnd.where(CadreTrainingSignUp::getCadreTrainingActId, "=", activityId).and(CadreTrainingSignUp::getUnionId, "=", SecurityUtil.getUnionId()));
+        return Result.success(list);
+    }
+
+
+    @At
+    @SaCheckPermission("cadreTraining.branchUnionSignUp")
+    @ApiOperation("查询本分工会名额")
+    public Result quota(@Param("activityId") String activityId) {
+        CadreTrainingAct cadreTrainingAct = dao.fetch(CadreTrainingAct.class, activityId);
+        Integer quota = cadreTrainingAct.getQuotas().stream().filter(v -> v.getStr("id", "").equals(SecurityUtil.getUnionId())).findFirst().map(v -> v.getInt("num")).orElse(0);
+        return Result.success(quota);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/model/CadreTrainingAct.java

@@ -0,0 +1,72 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.model;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName UnionReimburse
+ * @Author hongqiwei
+ * @Date 2025/9/19 14:45
+ * @Version 1.0
+ * @Description TODO
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("cadre_training")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("工会干部培训")
+public class CadreTrainingAct extends BaseModel {
+
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    @Comment("id")
+    private String id;
+
+    @Column
+    @Comment("活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String name;
+
+    @Column
+    @Comment("报名开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date signUpStartTime;
+
+    @Column
+    @Comment("报名结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date signUpEndTime;
+
+    @Column
+    @Comment("活动开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date startTime;
+
+    @Column
+    @Comment("活动结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date endTime;
+
+    @Column
+    @Comment("通知内容")
+    @ColDefine(customType = "longtext")
+    private String notice;
+
+
+    @Column
+    @Comment("名额分配")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> quotas;
+
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/model/CadreTrainingSignUp.java

@@ -0,0 +1,91 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.model;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("cadre_training_signup")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("工会干部培训报名")
+public class CadreTrainingSignUp extends BaseModel {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    @Comment("id")
+    private String id;
+
+    @Column
+    @Comment("活动ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String cadreTrainingActId;
+
+    @Column
+    @Comment("用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String userName;
+
+    @Column
+    @Comment("性别")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String sex;
+
+    @Column
+    @Comment("分工会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("分工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionName;
+
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String loginName;
+
+    @Column
+    @Comment("单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unitName;
+
+    @Column
+    @Comment("年龄")
+    @ColDefine(type = ColType.INT)
+    private Integer age;
+
+    @Column
+    @Comment("手机号")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String mobile;
+
+    @Column
+    @Comment("报名时间")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String applyTime;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String remark;
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/param/CadreTrainingActPageForm.java

@@ -0,0 +1,23 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.param;
+
+import com.budwk.app.base.param.PageForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@ApiModel("疗休养综合查询查询参数")
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CadreTrainingActPageForm extends PageForm {
+
+    @ApiModelProperty("活动ID")
+    private String actId;
+
+    @ApiModelProperty("分工会ID")
+    private String unionId;
+
+    @ApiModelProperty("单位ID")
+    private String unitId;
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/service/CadreTrainingActService.java

@@ -0,0 +1,7 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+
+public interface CadreTrainingActService extends BaseService<CadreTrainingAct> {
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/service/CadreTrainingSignUpService.java

@@ -0,0 +1,8 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingSignUp;
+
+
+public interface CadreTrainingSignUpService extends BaseService<CadreTrainingSignUp> {
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/service/impl/CadreTrainingActServiceImpl.java

@@ -0,0 +1,17 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.service.impl;
+
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingActService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+@Slf4j
+@IocBean(args = {"refer:dao"})
+public class CadreTrainingActServiceImpl extends BaseServiceImpl<CadreTrainingAct> implements CadreTrainingActService {
+    public CadreTrainingActServiceImpl(Dao dao) {
+        super(dao);
+    }
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/service/impl/CadreTrainingSignUpServiceImpl.java

@@ -0,0 +1,15 @@
+package com.budwk.app.zhgh.dayofficework.cadreTraining.service.impl;
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingSignUp;
+import com.budwk.app.zhgh.dayofficework.cadreTraining.service.CadreTrainingSignUpService;
+
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+@IocBean(args = {"refer:dao"})
+public class CadreTrainingSignUpServiceImpl extends BaseServiceImpl<CadreTrainingSignUp> implements CadreTrainingSignUpService {
+    public CadreTrainingSignUpServiceImpl(Dao dao) {
+        super(dao);
+    }
+}

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/vo/CadreTrainingCollectExcelVO.java

@@ -0,0 +1,40 @@
+// MaternityLeaveCollectExcelVO.java
+package com.budwk.app.zhgh.dayofficework.cadreTraining.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : hongqiwei
+ * @description :
+ * @createDate : 2025/9/16 17:08
+ */
+
+//工会干部培训，活动报名人导出
+@Data
+public class CadreTrainingCollectExcelVO {
+
+    @Excel(name = "报名时间", width = 20, format = "yyyy-MM-dd")
+    private Date applyTime;
+
+    @Excel(name = "姓名", width = 20)
+    private String userName;
+
+    @Excel(name = "性别", width = 20)
+    private String sex;
+
+    @Excel(name = "分工会", width = 20)
+    private String unionName;
+
+    @Excel(name = "单位", width = 20)
+    private String unitName;
+
+    @Excel(name = "活动名称", width = 20)
+    private String activityName;
+
+    @Excel(name = "电话", width = 20)
+    private String mobile;
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/rest/param/RestQueryPageForm.java

@@ -11,6 +11,9 @@ import lombok.EqualsAndHashCode;
 @Data
 public class RestQueryPageForm extends PageForm {
 
+    @ApiModelProperty("年度")
+    private String year;
+
     @ApiModelProperty("活动ID")
     private String actId;
 

src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java

@@ -2,19 +2,32 @@ package com.budwk.app.zhgh.staffbenefit.maternityLeave.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 cn.hutool.json.JSONUtil;
 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.CommonDownloadUtil;
+import com.budwk.app.base.utils.SysOfficeTemplateUtil;
 import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.vo.ProcessTaskVO;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.web.commons.base.Globals;
+import com.budwk.app.zhgh.activity.declarereimbursement.vo.ActivityBudgetVO;
 import com.budwk.app.zhgh.staffbenefit.maternityLeave.service.MaternityLeaveService;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 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;
@@ -25,6 +38,15 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static cn.dev33.satoken.SaManager.config;
+
 /**
  * @author : hongqiwei
  * @description :
@@ -38,10 +60,14 @@ import org.nutz.mvc.annotation.Param;
 @Slf4j
 public class MaternityLeaveMineController {
 
+    @Inject
+    private Dao dao;
     @Inject
     private FlowEngine flowEngine;
     @Inject
     private MaternityLeaveService maternityLeaveService;
+    @Inject
+    private SysOfficeTemplateUtil sysOfficeTemplateUtil;
 
 
     @At("/index")
@@ -105,5 +131,124 @@ public class MaternityLeaveMineController {
         flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
         return Result.success();
     }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("maternityLeave.mine")
+    @SLog(tag = "生育休假审批表", msg = "导出生育休假审批表")
+    public void doExportApply(@Valid String id, HttpServletResponse response) {
+        HashMap<String, Object> docData = new HashMap<>();
+
+        Sql sql = Sqls.create("""
+        SELECT
+          info.*,
+          ins.id AS instanceId
+        FROM
+          `maternity_leave` info
+          LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+        WHERE
+          info.id = @id
+        """).setParam("id", id);
+        sql.setCallback(Sqls.callback.map());
+        dao.execute(sql);
+        NutMap info = (NutMap) sql.getResult();
+
+        // 根据性别选择不同的模板和文件名
+        String sex = info.getString("sex");
+        String templateName;
+        String fileName;
+
+        if ("女性".equals(sex) || "女".equals(sex)) {
+            templateName = "maternity_leave_woman";
+            fileName = "女职工生育休假审批表_" + info.getString("userName") + ".docx";
+        } else {
+            templateName = "maternity_leave_man";
+            fileName = "男职工陪护假育儿假审批表_" + info.getString("userName") + ".docx";
+        }
+
+        // 添加日期格式化处理
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        // 格式化日期字段
+        if (info.get("birthday") != null) {
+            if (info.get("birthday") instanceof Date) {
+                info.put("birthday", sdf.format((Date) info.get("birthday")));
+            }
+        }
+
+        if (info.get("loverBirthday") != null) {
+            if (info.get("loverBirthday") instanceof Date) {
+                info.put("loverBirthday", sdf.format((Date) info.get("loverBirthday")));
+            }
+        }
+
+        if (info.get("childrenBirthday") != null) {
+            if (info.get("childrenBirthday") instanceof Date) {
+                info.put("childrenBirthday", sdf.format((Date) info.get("childrenBirthday")));
+            }
+        }
+
+        if (info.get("startTime") != null) {
+            if (info.get("startTime") instanceof Date) {
+                info.put("startTime", sdf.format((Date) info.get("startTime")));
+            }
+        }
+
+        if (info.get("endTime") != null) {
+            if (info.get("endTime") instanceof Date) {
+                info.put("endTime", sdf.format((Date) info.get("endTime")));
+            }
+        }
+
+        docData.put("schoolName", Globals.AppName);
+        docData.put("info", info);
+
+        List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
+        List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(info.getLong("instanceId"), null);
+        for (ProcessTask doneTask : doneTaskList) {
+            ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
+            doneTaskVos.add(taskVO);
+        }
+
+        // 各审批节点处理
+        doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName()))
+                .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
+                .ifPresent(v -> {
+                    Dict taskFormData = v.getTaskFormData();
+                    HashMap<String, Object> approval = new HashMap<>();
+
+                    approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
+                    approval.put("user", taskFormData.getStr("tf_userName"));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    }
+                    approval.put("opinion", taskFormData.getStr("tf_opinion"));
+                    docData.put("fgh", approval);
+                });
+
+        doneTaskVos.stream().filter(task -> "校工会审核".equals(task.getDisplayName()))
+                .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
+                .ifPresent(v -> {
+                    Dict taskFormData = v.getTaskFormData();
+                    HashMap<String, Object> approval = new HashMap<>();
+
+                    approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
+                    approval.put("user", taskFormData.getStr("tf_userName"));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    }
+                    approval.put("opinion", taskFormData.getStr("tf_opinion"));
+                    docData.put("xgh", approval);
+                });
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName)).render(docData).writeAndClose(byteArrayOutputStream);
+            CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response);
+        } catch (IOException e) {
+            log.error("生育休假审批表导出失败,id:{},错误信息：{}", id, e.getMessage());
+        }
+    }
+
+
 }
 

src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 
+import java.util.List;
+
 /**
  * @version 1.0
  * @Author zzr
@@ -22,11 +24,11 @@ public class MemberApplyPageForm extends PageForm {
 
     private String unitId;
 
-    private String userState;
+    private List<String> userStates;
 
-    private String personType;
+    private List<String> personTypes;
 
-    private String preparedBy;
+    private List<String> preparedBys;
 
     public static void buildSearch(Cnd cnd, MemberApplyPageForm pageForm) {
         if (cnd == null) {
@@ -40,8 +42,8 @@ public class MemberApplyPageForm extends PageForm {
         }
         cnd.andEX("info.unionId","=",pageForm.getUnionId());
         cnd.andEX("info.unitId","=",pageForm.getUnitId());
-        cnd.andEX("info.userState","=",pageForm.getUserState());
-        cnd.andEX("info.personType","=",pageForm.getPersonType());
-        cnd.andEX("info.preparedBy","=",pageForm.getPreparedBy());
+        cnd.andEX("info.userState","in",pageForm.getUserStates());
+        cnd.andEX("info.personType","in",pageForm.getPersonTypes());
+        cnd.andEX("info.preparedBy","in",pageForm.getPreparedBys());
     }
 }

src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 
+import java.util.List;
+
 /**
  * @version 1.0
  * @Author zzr
@@ -29,15 +31,15 @@ public class MemberChangePageForm extends PageForm {
 
     // 在职状态
     @ApiModelProperty("在职状态")
-    private String userState;
+    private List<String> userStates;
 
     // 在职状态
     @ApiModelProperty("编制类型")
-    private String preparedBy;
+    private List<String> preparedBys;
 
     // 人员类型
     @ApiModelProperty("人员类型")
-    private String personType;
+    private List<String> personTypes;
 
 
     public void buildSearch(Cnd cnd, String prefix){
@@ -54,8 +56,8 @@ public class MemberChangePageForm extends PageForm {
 
         cnd.andEX(prefix + "unionId", "=", this.getUnionId());
         cnd.andEX(prefix + "unitId", "=", this.getUnitId());
-        cnd.andEX(prefix + "userState", "=", this.getUserState());
-        cnd.andEX(prefix + "preparedBy", "=", this.getPreparedBy());
-        cnd.andEX(prefix + "personType", "=", this.getPersonType());
+        cnd.andEX(prefix + "userState", "in", this.getUserStates());
+        cnd.andEX(prefix + "preparedBy", "in", this.getPreparedBys());
+        cnd.andEX(prefix + "personType", "in", this.getPersonTypes());
     }
 }

src/main/resources/static/components/plugins/sysDict/DictSelect.vue

@@ -24,7 +24,7 @@
 <script>
 module.exports = {
     props: {
-        value: { type: String },
+        value: { type: [String, Array] },
         code: {
             type: [String, Array],
             default: ""

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/formEdit.js

@@ -0,0 +1,462 @@
+const formEdit = {
+    template: /*language=HTML*/ `
+        <el-dialog :title="formData.id ? '编辑' : '新增'" :visible="visible" width="70%" :close-on-click-modal="false">
+            <el-steps :active="activeStep" finish-status="success" simple>
+                <el-step title="基础信息"></el-step>
+                <el-step title="名额设置"></el-step>
+            </el-steps>
+
+            <!-- Step 1: 基础信息 -->
+            <div v-show="activeStep === 0">
+                <el-form :model="formData" ref="form" :rules="formRules" label-width="120px" class="form-container">
+                    <el-form-item label="活动名称" prop="name">
+                        <el-input v-model="formData.name" placeholder="请输入活动名称" maxlength="50"
+                                  show-word-limit>
+                        </el-input>
+                    </el-form-item>
+
+                    <el-row :gutter="20">
+                        <el-col :span="12">
+                            <el-form-item label="报名开始时间" prop="signUpStartTime">
+                                <el-date-picker v-model="formData.signUpStartTime" type="datetime"
+                                                placeholder="请选择报名开始时间"
+                                                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="报名结束时间" prop="signUpEndTime">
+                                <el-date-picker v-model="formData.signUpEndTime" type="datetime"
+                                                placeholder="请选择报名结束时间"
+                                                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row :gutter="20">
+                        <el-col :span="12">
+                            <el-form-item label="活动开始时间" prop="startTime">
+                                <el-date-picker v-model="formData.startTime" type="datetime"
+                                                placeholder="请选择活动开始时间"
+                                                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="活动结束时间" prop="endTime">
+                                <el-date-picker v-model="formData.endTime" type="datetime"
+                                                placeholder="请选择活动结束时间"
+                                                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-form-item label="通知内容" prop="notice">
+                        <text-editor v-model="formData.notice"></text-editor>
+                    </el-form-item>
+                </el-form>
+            </div>
+
+            <!-- Step 2: 名额设置 -->
+            <div v-show="activeStep === 1">
+                <el-form :model="formData" ref="quotaForm" :rules="formRules" label-width="120px"
+                         class="form-container">
+                    <el-form-item label="名额分配" prop="quotas">
+                        <div class="quota-summary" v-if="formData.quotas.length > 0">
+                            <span>总名额：<span class="quota-count"
+                                               style="margin-right: 0;">{{ totalQuota }}</span></span>
+                            <span>已设置：<span class="quota-count" style="margin-right: 0;">{{ allocatedQuota }}</span> / {{ formData.quotas.length }}</span>
+                            <span>未设置：<span class="quota-count quota-unset">{{ formData.quotas.length - allocatedQuota }}</span></span>
+                        </div>
+                        <el-table :data="formData.quotas"
+                                  border
+                                  style="width: 100%"
+                                  max-height="450px"
+                        >
+                            <el-table-column label="序号" width="80" align="center" type="index"></el-table-column>
+                            <el-table-column label="工会名称" prop="name"></el-table-column>
+                            <el-table-column label="名额数量" width="200" align="center">
+                                <template slot-scope="scope">
+                                    <el-input-number v-model="scope.row.num" :min="0" :controls="false"
+                                                     placeholder="请输入名额数量"
+                                                     style="width: 100%"
+                                                     @change="handleQuotaChange(scope.row)">
+                                    </el-input-number>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="quota-actions">
+                            <el-button type="primary" size="mini" @click="setAllQuotas">批量设置名额</el-button>
+                            <el-button size="mini" @click="clearAllQuotas">清除全部名额</el-button>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </div>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">取 消</el-button>
+                <el-button @click="prevStep" v-if="activeStep > 0">
+                    <i class="el-icon-arrow-left"></i> 上一步
+                </el-button>
+                <el-button type="primary" @click="nextStep" v-if="activeStep < 1">
+                    下一步 <i class="el-icon-arrow-right"></i>
+                </el-button>
+                <el-button type="primary" @click="submitForm" :loading="submitting" v-if="activeStep === 1">
+                    {{ submitting ? '提交中...' : '确定' }}
+                </el-button>
+            </div>
+        </el-dialog>
+    `,
+    data() {
+        // 日期验证器
+        const validateDateRange = (rule, value, callback) => {
+            const { signUpStartTime, signUpEndTime, startTime, endTime } = this.formData
+
+            if (rule.field === "signUpEndTime" && signUpStartTime && signUpEndTime) {
+                if (new Date(signUpEndTime) <= new Date(signUpStartTime)) {
+                    callback(new Error("报名结束时间必须晚于报名开始时间"))
+                    return
+                }
+            }
+
+            if (rule.field === "startTime" && signUpEndTime && startTime) {
+                if (new Date(startTime) <= new Date(signUpEndTime)) {
+                    callback(new Error("活动开始时间必须晚于报名结束时间"))
+                    return
+                }
+            }
+
+            if (rule.field === "endTime" && startTime && endTime) {
+                if (new Date(endTime) <= new Date(startTime)) {
+                    callback(new Error("活动结束时间必须晚于活动开始时间"))
+                    return
+                }
+            }
+
+            callback()
+        }
+
+        return {
+            visible: false,
+            activeStep: 0,
+            submitting: false,
+            formData: {
+                quotas: []
+            },
+            batchQuotaDialogVisible: false,
+            batchQuotaValue: 0,
+            formRules: {
+                name: [
+                    { required: true, message: "请输入活动名称", trigger: "blur" },
+                    { min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur" }
+                ],
+                signUpStartTime: [{ required: false, message: "请选择报名开始时间", trigger: "blur" }],
+                signUpEndTime: [
+                    { required: false, message: "请选择报名结束时间", trigger: "blur" },
+                    { validator: validateDateRange, trigger: "blur" }
+                ],
+                startTime: [
+                    { required: false, message: "请选择活动开始时间", trigger: "blur" },
+                    { validator: validateDateRange, trigger: "blur" }
+                ],
+                endTime: [
+                    { required: false, message: "请选择活动结束时间", trigger: "blur" },
+                    { validator: validateDateRange, trigger: "blur" }
+                ],
+                notice: [{ required: true, message: "请输入通知内容", trigger: "blur" }],
+                quotas: [{ required: true, type: "array", message: "请设置名额分配", trigger: "change" }]
+            },
+            unionOptions: []
+        }
+    },
+    computed: {
+        // 计算总名额
+        totalQuota() {
+            return this.formData.quotas.reduce((sum, quota) => {
+                // 只计算已明确设置了数值的项
+                if (quota.num !== null && quota.num !== undefined) {
+                    return sum + parseInt(quota.num || 0)
+                }
+                return sum
+            }, 0)
+        },
+        // 已分配名额数量（不包括未设置的）
+        allocatedQuota() {
+            return this.formData.quotas.filter((q) => q.num !== null && q.num !== undefined).length
+        }
+    },
+    methods: {
+        // 检查名额是否未设置
+        isQuotaUnset(value) {
+            return value === null || value === undefined
+        },
+
+        // 处理名额变更
+        handleQuotaChange(row) {
+            // 确保值转换为数字或null
+            if (row.num === "" || row.num === undefined) {
+                row.num = null
+            } else {
+                row.num = parseInt(row.num)
+            }
+            this.validateQuotas()
+        },
+
+        // 批量设置名额
+        setAllQuotas() {
+            this.$prompt("请输入要批量设置的名额数量", "批量设置", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                inputType: "number",
+                inputValidator: (value) => {
+                    if (value === "") return "名额不能为空"
+                    if (parseInt(value) < 0) return "名额不能为负数"
+                    return true
+                }
+            })
+                .then(({ value }) => {
+                    const num = parseInt(value)
+                    this.formData.quotas.forEach((q) => {
+                        q.num = num
+                    })
+                    this.validateQuotas()
+                    this.$message.success("已将所有工会名额设置为" + num)
+                })
+                .catch(() => {})
+        },
+
+        // 清除所有名额
+        clearAllQuotas() {
+            this.$confirm("确定要清除所有名额设置吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    this.formData.quotas.forEach((q) => {
+                        q.num = undefined
+                    })
+                    this.validateQuotas()
+                    this.$message.success("已清除所有名额设置")
+                })
+                .catch(() => {})
+        },
+
+        // 打开表单
+        onOpen(id) {
+            this.visible = true
+            this.activeStep = 0
+            this.formData = {
+                quotas: []
+            }
+
+            if (id) {
+                // 如果是编辑模式，加载数据
+                this.$axios.post("/platform/cadreTraining/activity/get", { id: id }).then((res) => {
+                    if (res.code === 0) {
+                        this.formData = res.data
+                    }
+                })
+            } else {
+                this.$businessTool.listUnion().then((res) => {
+                    this.unionOptions = res
+                    this.formData.quotas = res.map((item) => ({
+                        id: item.id,
+                        name: item.name,
+                        code: item.code,
+                        num: undefined // 默认名额为null（未设置）
+                    }))
+                })
+            }
+        },
+
+        // 上一步
+        prevStep() {
+            if (this.activeStep > 0) {
+                this.activeStep--
+            }
+        },
+
+        // 下一步
+        nextStep() {
+            const formRefs = [this.$refs.form, this.$refs.quotaForm]
+            const currentForm = formRefs[this.activeStep]
+
+            currentForm.validate((valid) => {
+                if (valid) {
+                    if (this.activeStep < 1) {
+                        this.activeStep++
+                    }
+                } else {
+                    this.$message.warning("请完成必填项")
+                }
+            })
+        },
+
+        // 验证名额
+        validateQuotas() {
+            this.$refs.quotaForm && this.$refs.quotaForm.validateField("quotas")
+        },
+
+        // 提交表单
+        submitForm() {
+            // 验证所有表单
+            Promise.all([
+                new Promise((resolve) => this.$refs.form.validate((valid) => resolve(valid))),
+                new Promise((resolve) => this.$refs.quotaForm.validate((valid) => resolve(valid)))
+            ]).then((results) => {
+                if (results.every((valid) => valid)) {
+                    const invalidQuota = this.formData.quotas.some((q) => {
+                        // 只检查已设置了值的，未设置的不检查
+                        if (q.num !== null && q.num !== undefined) {
+                            return q.num < 0 || !Number.isInteger(parseInt(q.num))
+                        }
+                        return false
+                    })
+
+                    if (invalidQuota) {
+                        this.$message.error("请填写有效的名额数量（非负整数）")
+                        return
+                    }
+
+                    // 检查是否所有名额都未设置
+                    if (this.allocatedQuota === 0) {
+                        this.$confirm("当前所有工会名额均未设置，是否继续提交？", "提示", {
+                            confirmButtonText: "继续提交",
+                            cancelButtonText: "返回修改",
+                            type: "warning"
+                        })
+                            .then(() => {
+                                this.doSubmit()
+                            })
+                            .catch(() => {})
+                        return
+                    }
+
+                    this.doSubmit()
+                } else {
+                    // 切换到第一个验证失败的步骤
+                    if (!results[0]) this.activeStep = 0
+                    else if (!results[1]) this.activeStep = 1
+                }
+            })
+        },
+
+        // 执行提交操作
+        doSubmit() {
+            this.submitting = true
+
+            this.$axios
+                .post("/platform/cadreTraining/activity/" + (this.formData.id ? "update" : "insert"), { cadreTrainingAct: JSON.stringify(this.formData) })
+                .then((res) => {
+                    if (res.code === 0) {
+                        this.visible = false
+                        this.$message.success(res.msg)
+                        this.$emit("refresh")
+                    }
+                })
+                .finally(() => {
+                    this.submitting = false
+                })
+        }
+    },
+    style: /*language=CSS*/ `
+        .form-container {
+            padding: 0 50px;
+            margin-top: 20px;
+            margin-bottom: 20px;
+        }
+
+        .batch-container {
+            background-color: #fff;
+            border-radius: 4px;
+            width: 100%;
+        }
+
+        .empty-batch {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            padding: 40px 0;
+            background-color: #fafafa;
+            border: 1px dashed #d9d9d9;
+            border-radius: 4px;
+        }
+
+        .empty-icon {
+            font-size: 48px;
+            color: #909399;
+            margin-bottom: 15px;
+        }
+
+        .empty-text {
+            color: #909399;
+            font-size: 16px;
+            margin-bottom: 15px;
+        }
+
+        .empty-action {
+            margin-top: 5px;
+        }
+
+        .no-data {
+            text-align: center;
+            color: #909399;
+            padding: 20px 0;
+        }
+
+        .quota-summary {
+            display: flex;
+            margin-bottom: 15px;
+            background: #f8f8f8;
+            padding: 10px 15px;
+            border-radius: 4px;
+        }
+
+        .quota-summary span {
+            margin-right: 20px;
+            color: #606266;
+        }
+
+        .quota-count {
+            font-weight: bold;
+            color: #409EFF;
+            padding: 0 5px;
+        }
+
+        .quota-unset {
+            color: #E6A23C;
+        }
+
+        .quota-status {
+            font-size: 12px;
+            margin-top: 5px;
+            text-align: center;
+        }
+
+        .quota-unset-tip {
+            color: #E6A23C;
+        }
+
+        .quota-zero-tip {
+            color: #F56C6C;
+        }
+
+        .quota-set-tip {
+            color: #67C23A;
+        }
+
+        .quota-actions {
+            margin-top: 15px;
+            text-align: right;
+        }
+
+        /* 按钮样式优化 */
+        .el-button [class*="el-icon-"] + span {
+            margin-left: 5px;
+        }
+    `
+}

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html

@@ -0,0 +1,84 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <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"></el-input>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <table-tool>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="openAdd">新增</el-button>
+        </table-tool>
+        <el-table :data="tableData">
+            <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+            <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="signUpStartTime" label="报名开始时间"></el-table-column>
+            <el-table-column prop="signUpEndTime" label="报名结束时间"></el-table-column>
+            <el-table-column prop="startTime" label="开始时间"></el-table-column>
+            <el-table-column prop="endTime" label="结束时间"></el-table-column>
+            <el-table-column label="操作" width="200px" fixed="right">
+                <template slot-scope="{row}">
+                    <el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="onDelete(row.id)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--#include("/layouts/pagination.html"){}#-->
+    </el-card>
+
+    <form-edit ref="formEditRef" @refresh="doSearch"></form-edit>
+</div>
+
+<script>
+    <!--#include('formEdit.js'){}#-->
+
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "form-edit": formEdit
+        },
+        data() {
+            return {}
+        },
+        methods: {
+            openAdd() {
+                this.$refs.formEditRef.onOpen()
+            },
+            openEdit(row) {
+                this.$refs.formEditRef.onOpen(row.id)
+            },
+            onDelete(id) {
+                this.$confirm("您确定要删除吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(async () => {
+                        const { code, msg } = await this.$axios.post("/platform/cadreTraining/activity/delete", { id: id })
+                        if (code === 0) {
+                            this.$message.success(msg)
+                            this.doSearch()
+                        }
+                    })
+                    .catch(() => {})
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html

@@ -0,0 +1,176 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            v-model="pageForm.year"
+                            type="year"
+                            :clearable="false"
+                            value-format="yyyy"
+                            placeholder="年度"
+                            style="width: 100%"
+                            @change="getActivityByYear">
+                    </el-date-picker>
+                </search-item>
+                <search-item label="活动名称">
+                    <el-select v-model="pageForm.activityId" placeholder="请选择活动名称" clearable style="width: 100%" @change="doSearch">
+                        <el-option v-for="item in activityList"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="姓名">
+                    <el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
+                </search-item>
+                <search-item label="性别">
+                    <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
+                        <el-option label="男性" value="男性"></el-option>
+                        <el-option label="女性" value="女性"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="工会名称">
+                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择工会名称" clearable>
+                        <el-option v-for="item in unionOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="单位名称">
+                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择单位名称" clearable>
+                        <el-option v-for="item in unitOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-button @click="onExport" icon="el-icon-s-promotion" type="primary" size="small">导出</el-button>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
+                <el-table-column prop="sex" label="性别"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
+                <el-table-column prop="name" label="活动名称"></el-table-column>
+                <el-table-column prop="applyTime" label="报名时间"></el-table-column>
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="$auth.hasRole('SYSADMIN')" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <cadre-training-info ref="cadreTrainingInfoRef"></cadre-training-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include('../common/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        //分页数据
+        mixins: [initTableMixins],
+        components: {
+            "cadre-training-info": cadreTrainingInfo,
+        },
+        data() {
+            return {
+                pageDataUrl: "/platform/cadreTraining/collect/pageData",
+                unionOptions: [],
+                unitOptions: [],
+                userOptions: [],
+                activityList: [],
+                currentYear: new Date().getFullYear(),
+                pageForm: {
+                    year: new Date().getFullYear() + "",
+                    activityId: "",
+                    userName: "",
+                    sex: "",
+                    unionId: "",
+                    unitId: ""
+                }
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.view(()=>{
+                    this.$refs.cadreTrainingInfoRef.onOpen(row)
+                })
+            },
+            onDelete(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/cadreTraining/collect/delete", {id}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+            onExport() {
+                this.$downLoad('/platform/cadreTraining/collect/onExport', this.pageForm)
+            },
+            // 根据年度获取活动列表
+            async getActivityByYear() {
+                const res = await this.$axios.post("/platform/cadreTraining/collect/getActivityList", {
+                    year: this.pageForm.year
+                });
+                if (res.code === 0) {
+                    this.activityList = res.data;
+                    // 默认选中最新的活动（第一个）
+                    if (res.data && res.data.length > 0) {
+                        this.pageForm.activityId = res.data[0].id;
+                        this.pageData()
+                    } else {
+                        this.pageForm.activityId = "";  // 数据为空时设为空字符串
+                    }
+                }
+            }
+        },
+        async created() {
+            // 获取当前年度的活动列表
+            await this.getActivityByYear();
+
+            // 获取工会和单位列表
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res));
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res));
+
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/common/info.js

@@ -0,0 +1,114 @@
+const cadreTrainingInfo = {
+    template: /*language=HTML*/ `
+        <div>
+            <div class="process-title">
+                报名信息
+                <el-link type="primary" @click="openChart">点击查看流程图</el-link>
+            </div>
+            <table-tool label="活动信息"></table-tool>
+            <el-descriptions :column="2" border class="flow-task-form">
+                <el-descriptions-item label="活动名称" :span="2">{{viewData.name}}</el-descriptions-item>
+                <el-descriptions-item label="报名开始时间">{{viewData.signUpStartTime}}</el-descriptions-item>
+                <el-descriptions-item label="报名结束时间">{{viewData.signUpEndTime}}</el-descriptions-item>
+                <el-descriptions-item label="活动开始时间">{{viewData.startTime}}</el-descriptions-item>
+                <el-descriptions-item label="活动结束时间" >{{viewData.endTime}}</el-descriptions-item>
+                <el-descriptions-item label="活动内容" > <div v-html="viewData.notice"></div></el-descriptions-item>
+                </el-descriptions>
+            <table-tool label="人员信息"></table-tool>
+            <el-descriptions :column="2" border class="flow-task-form">
+                <el-descriptions-item label="姓名">{{viewData.userName}}</el-descriptions-item>
+                <el-descriptions-item label="分工会">{{viewData.unionName}}</el-descriptions-item>
+                <el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
+                <el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
+                <el-descriptions-item label="手机号">{{viewData.mobile}}</el-descriptions-item>
+                <el-descriptions-item label="备注">{{viewData.remark}}</el-descriptions-item>
+                </el-descriptions>
+
+            <template v-for="task in doneTasks">
+                <div class="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>
+                        <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
+                            task.taskFormData.opinion }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
+                            <el-image :src="task.ext.tf_userSign"
+                                      v-if="task.ext.tf_userSign"
+                                      class="signature-image"></el-image>
+                            <span v-else>暂无</span>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </template>
+            <slot></slot>
+
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
+        </div>
+    `,
+    store,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    data() {
+        return {
+            visible: false,
+            viewData: {},
+            doneTasks: [],
+            row: null
+        }
+    },
+    methods: {
+        // 打开
+        onOpen(row) {
+            this.row = row
+            this.visible = true
+            this.getInfo()
+            this.getDoneTasks()
+        },
+
+        // 获取申请信息
+        getInfo() {
+            this.viewData = { ...this.row };
+            // this.$axios.post('/platform/cadreTraining/activity/get', {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/dayofficework/cadreTraining/mine/index.html

@@ -0,0 +1,114 @@
+<!--#
+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"></el-input>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
+                <el-table-column prop="name" label="活动名称"></el-table-column>
+                <el-table-column prop="applyTime" label="报名时间"></el-table-column>
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.canRevoke" @click="onCancelSignUp(row)" size="mini" type="danger">取消报名
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <cadre-training-info ref="cadreTrainingInfoRef"></cadre-training-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include('/platform/zhgh/dayofficework/cadreTraining/common/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        //分页数据
+        mixins: [initTableMixins],
+        components: {
+            "cadre-training-info": cadreTrainingInfo,
+        },
+        data() {
+            return {
+                pageDataUrl: "/platform/cadreTraining/mine/pageData",
+                unionOptions: [],
+                unitOptions: [],
+                userOptions: [],
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.view(()=>{
+                    this.$refs.cadreTrainingInfoRef.onOpen(row)
+                })
+            },
+
+            // 取消报名（原撤回功能）
+            onCancelSignUp(row) {
+                this.$confirm("您确定要取消报名吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(async () => {
+                    try {
+                        // 执行撤回操作
+                        if (row.startTaskId) {
+                            const revokeRes = await this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId});
+                            if (revokeRes.code !== 0) {
+                                this.$message.error(revokeRes.msg || "撤回失败");
+                                return;
+                            }
+                        }
+
+                        // 执行删除操作
+                        const deleteRes = await this.$axios.post("/platform/cadreTraining/mine/delete", {id: row.id});
+                        if (deleteRes.code === 0) {
+                            this.$message.success("取消报名成功");
+                            this.pageData();
+                        } else {
+                            this.$message.error(deleteRes.msg || "取消报名失败");
+                        }
+                    } catch (error) {
+                        this.$message.error("操作失败");
+                    }
+                })
+            },
+
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html

@@ -0,0 +1,246 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            v-model="pageForm.year"
+                            type="year"
+                            value-format="yyyy"
+                            placeholder="年度"
+                            style="width: 100%"
+                            @change="getActivityByYear">
+                    </el-date-picker>
+                </search-item>
+                <search-item label="活动名称">
+                    <el-select v-model="pageForm.activityId" placeholder="请选择活动名称" clearable style="width: 100%" @change="doSearch">
+                        <el-option v-for="item in activityList"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="姓名">
+                    <el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
+                </search-item>
+                <search-item label="性别">
+                    <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
+                        <el-option label="男性" value="男性"></el-option>
+                        <el-option label="女性" value="女性"></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="工会名称">
+                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择工会名称" clearable>
+                        <el-option v-for="item in unionOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="单位名称">
+                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择单位名称" clearable>
+                        <el-option v-for="item in unitOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <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" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
+                <el-table-column prop="sex" label="性别"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
+                <el-table-column prop="name" label="活动名称"></el-table-column>
+                <el-table-column prop="applyTime" label="报名时间"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <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" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #view>
+            <cadre-training-info ref="cadreTrainingInfoRef">
+                <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-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <pc-signature v-model="formData.tf_userSign"></pc-signature>
+                        </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(6)" size="small" type="info">退回到发起人</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>
+            </cadre-training-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include('../common/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        //分页数据
+        mixins: [initTableMixins],
+        components: {
+            "cadre-training-info": cadreTrainingInfo
+        },
+        data() {
+            return {
+                pageDataUrl: "/platform/cadreTraining/schoolAudit/pageData",
+                pageForm: {
+                    approval: false,
+                    year: new Date().getFullYear() + "",  // 添加年份默认值
+                    activityId: "",  // 添加活动ID
+                    userName: "",
+                    sex: "",
+                    unionId: "",
+                    unitId: ""
+                },
+                formData: {},
+                showApprovalForm: false,
+                unionOptions: [],
+                unitOptions: [],
+                userOptions: [],
+                activityList: []  // 添加活动列表
+            }
+        },
+        methods: {
+            onView(row) {
+                this.$refs.guava.view(()=>{
+                    this.$refs.cadreTrainingInfoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.view(()=>{
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.cadreTrainingInfoRef.onOpen(row)
+                })
+            },
+            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()
+                        }
+                    })
+                })
+            },
+            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()
+                        }
+                    })
+                })
+            },
+            // 根据年度获取活动列表
+            async getActivityByYear() {
+                if (!this.pageForm.year) {
+                    this.activityList = [];
+                    this.pageForm.activityId = "";
+                    return;
+                }
+
+                try {
+                    const res = await this.$axios.post("/platform/cadreTraining/collect/getActivityList", {
+                        year: parseInt(this.pageForm.year)
+                    });
+                    if (res.code === 0) {
+                        this.activityList = res.data;
+                        // 如果当前选中的活动不在新列表中，清空选择
+                        if (this.pageForm.activityId && !res.data.some(item => item.id === this.pageForm.activityId)) {
+                            this.pageForm.activityId = "";
+                        }
+                        this.doSearch();
+                    }
+                } catch (error) {
+                    console.error("获取活动列表失败:", error);
+                    this.activityList = [];
+                    this.pageForm.activityId = "";
+                }
+            },
+            // 添加搜索方法
+            doSearch() {
+                this.pageData();
+            }
+        },
+        created() {
+            // 初始化获取活动列表
+            this.getActivityByYear();
+
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html

@@ -0,0 +1,135 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <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"></el-input>
+            </search-item>
+        </search>
+    </el-card>
+
+    <el-card shadow="never">
+        <table-tool></table-tool>
+        <el-table :data="tableData">
+            <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+            <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="signUpStartTime" label="报名开始时间">
+                <template slot-scope="{row}">{{ formatDate(row.signUpStartTime) }}</template>
+            </el-table-column>
+            <el-table-column prop="signUpEndTime" label="报名结束时间">
+                <template slot-scope="{row}">{{ formatDate(row.signUpEndTime) }}</template>
+            </el-table-column>
+            <el-table-column prop="startTime" label="开始时间">
+                <template slot-scope="{row}">{{ formatDate(row.startTime) }}</template>
+            </el-table-column>
+            <el-table-column prop="endTime" label="结束时间">
+                <template slot-scope="{row}">{{ formatDate(row.endTime) }}</template>
+            </el-table-column>
+            <el-table-column prop="status" label="状态" width="100">
+                <template slot-scope="{row}">
+                    <el-tag :type="getStatusType(row)" size="mini">{{ getStatusText(row) }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" width="200px" fixed="right">
+                <template slot-scope="{row}">
+                    <el-button
+                            size="mini"
+                            type="primary"
+                            @click="openSign(row)"
+                            :disabled="getStatusText(row) !== '报名中'">
+                        报名
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--#include("/layouts/pagination.html"){}#-->
+    </el-card>
+
+    <sign-form ref="signFormRef" @refresh="doSearch"></sign-form>
+</div>
+
+<script>
+    <!--#include("signForm.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "sign-form": signForm
+        },
+        data() {
+            return {
+                pageForm: {
+                    year: new Date().getFullYear().toString(),
+                    searchKeyword: ""
+                },
+                now: new Date().getTime()
+            }
+        },
+        methods: {
+            doSearch() {
+                this.now = new Date().getTime()
+                this.pageData()
+            },
+            openSign(row) {
+                this.$refs.signFormRef.onOpen(row)
+            },
+            viewDetail(row) {},
+            // 格式化时间
+            formatDate(dateStr) {
+                if (!dateStr) return "-"
+                return dateStr.substring(0, 16).replace("T", " ")
+            },
+            // 获取活动状态
+            getStatusText(row) {
+                const now = this.now
+                const signUpStartTime = row.signUpStartTime ? new Date(row.signUpStartTime).getTime() : 0
+                const signUpEndTime = row.signUpEndTime ? new Date(row.signUpEndTime).getTime() : 0
+                const startTime = row.startTime ? new Date(row.startTime).getTime() : 0
+                const endTime = row.endTime ? new Date(row.endTime).getTime() : 0
+
+                if (now < signUpStartTime) {
+                    return "未开始"
+                } else if (now >= signUpStartTime && now <= signUpEndTime) {
+                    return "报名中"
+                } else if (now > signUpEndTime && now < startTime) {
+                    return "报名结束"
+                } else if (now >= startTime && now <= endTime) {
+                    return "活动中"
+                } else {
+                    return "已结束"
+                }
+            },
+            // 获取状态标签类型
+            getStatusType(row) {
+                const status = this.getStatusText(row)
+                switch (status) {
+                    case "未开始":
+                        return "info"
+                    case "报名中":
+                        return "success"
+                    case "报名结束":
+                        return "warning"
+                    case "活动中":
+                        return "primary"
+                    case "已结束":
+                        return ""
+                    default:
+                        return ""
+                }
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/signForm.js

@@ -0,0 +1,226 @@
+const signForm = {
+    template: /*language=HTML*/ `
+        <el-dialog title="活动报名" :visible.sync="dialogVisible" width="70%" @open="handleDialogOpen">
+            <div class="process-title">
+                <snaker-start slot="header" define_key="GBPX"  label="活动报名"></snaker-start>
+            </div>
+            <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+                <el-descriptions-item label="活动名称" span="2">
+                    <span class="item-center">  {{ viewData.name }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="报名开始时间">
+                    {{ viewData.signUpStartTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="报名结束时间">
+                    {{ viewData.signUpEndTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="开始时间">
+                    {{ viewData.startTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="结束时间">
+                    {{ viewData.endTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="分工会名额">
+                    {{ quota }}人 / 剩余: {{ remainingQuota }}人
+                </el-descriptions-item>
+                <el-descriptions-item label="活动内容" span="2">
+                    <div v-html="viewData.notice"></div>
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <!-- 个人报名信息 -->
+            <div class="process-title">个人报名信息</div>
+            <el-table :data="teamUsers" class="mt10">
+                <el-table-column label="序号" type="index" width="60px"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
+                <el-table-column prop="sex" label="性别"></el-table-column>
+                <el-table-column prop="unionName" label="分工会"></el-table-column>
+                <el-table-column prop="unitName" label="单位"></el-table-column>
+                <el-table-column prop="mobile" label="手机号"></el-table-column>
+                <el-table-column prop="remark" label="备注">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-row type="flex" justify="end" class="mt20">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="onConfirm" :loading="submitLoading"
+                           :disabled="isSignUp || remainingQuota === 0">确认报名</el-button>
+            </el-row>
+        </el-dialog>
+    `,
+    store,
+    data() {
+        return {
+            dialogVisible: false,
+            viewData: {},
+            formData: {}, // 将 signUpData 改为 formData
+            id: null,
+            //表格用户（实际上只包含当前用户）
+            teamUsers: [],
+            quota: 0, // 报名名额限制
+            signedUsers: [], // 已报名人员列表
+            submitLoading: false, // 提交按钮加载状态
+            isSignUp: false // 是否已报名
+        }
+    },
+    computed: {
+        remainingQuota() {
+            // 如果 quota 为 null 或 undefined，显示"不限"
+            if (this.quota == null) return "不限"
+            // 如果 quota 为具体数值（包括0），则计算剩余名额
+            const remaining = Math.max(0, this.quota - this.signedUsers.length)
+            return remaining
+        },
+    },
+    methods: {
+        onOpen(row) {
+            this.row = row
+            this.dialogVisible = true
+            this.id = row.id;
+        },
+
+        handleDialogOpen() {
+            this.getActivityInfo()
+            this.getQuota(this.id)
+            this.loadUserData()
+        },
+
+        // 加载用户数据
+        async loadUserData() {
+            try {
+                // 获取已报名人员
+                const signedResponse = await this.$axios.post("/platform/cadreTraining/branchUnionSignUp/listSignUser", { activityId: this.id })
+                if (signedResponse.code === 0) {
+                    this.signedUsers = Array.isArray(signedResponse.data) ? signedResponse.data : []
+
+                    // 检查当前用户是否已报名
+                    const currentUser = this.signedUsers.find(user => user.userId === this.$store.state.user.id)
+                    this.isSignUp = !!currentUser
+
+                    // 显示当前用户信息
+                    if (currentUser) {
+                        this.teamUsers = [currentUser]
+                    } else {
+                        // 如果当前用户未报名，显示当前用户信息用于报名
+                        this.teamUsers = [{
+                            userId: this.$store.state.user.id,
+                            userName: this.$store.state.user.username,
+                            loginName: this.$store.state.user.loginname,
+                            unitId: this.$store.state.user?.unit?.id,
+                            unitName: this.$store.state.user?.unit?.name,
+                            unionId: this.$store.state.user?.union?.id,
+                            unionName: this.$store.state.user?.union?.name,
+                            sex: this.$store.state.user.sex,
+                            mobile: this.$store.state.user.mobile,
+                            remark: ''
+                        }]
+                    }
+
+                    // 初始化表单数据
+                    this.initFormData();
+                }
+            } catch (error) {
+                this.$message.error("获取用户数据失败")
+            }
+        },
+
+        // 初始化表单数据
+        initFormData() {
+            if (this.teamUsers.length > 0) {
+                const user = this.teamUsers[0];
+                this.formData = {
+                    cadreTrainingActId: this.id,
+                    userId: user.userId,
+                    userName: user.userName,
+                    loginName: user.loginName,
+                    unitId: user.unitId,
+                    unitName: user.unitName,
+                    unionId: user.unionId,
+                    unionName: user.unionName,
+                    sex: user.sex,
+                    mobile: user.mobile,
+                    remark: user.remark || ''
+                };
+            }
+        },
+
+        // 获取名额限制
+        async getQuota(id) {
+            try {
+                const { code, data } = await this.$axios.post("/platform/cadreTraining/branchUnionSignUp/quota", { activityId: id })
+                if (code === 0) {
+                    this.quota = data
+                }
+            } catch (error) {
+                this.$message.error("获取名额限制失败")
+            }
+        },
+
+        //活动信息
+        getActivityInfo() {
+            this.$axios.post("/platform/cadreTraining/activity/get", {id: this.id}).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+
+        //提交报名
+        async onConfirm() {
+            // 检查是否已报名
+            if (this.isSignUp) {
+                this.$message.warning("您已报名该活动！")
+                return
+            }
+
+            // 检查名额限制
+            if (this.quota > 0 && this.signedUsers.length >= this.quota) {
+                this.$message.warning("该活动报名名额已满！")
+                return
+            }
+
+            // 更新表单数据中的备注信息
+            if (this.teamUsers.length > 0) {
+                this.formData.remark = this.teamUsers[0].remark || '';
+            }
+
+            try {
+                this.submitLoading = true;
+
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(async () => {
+                    try {
+                        const { code, msg } = await this.$axios.post('/platform/cadreTraining/branchUnionSignUp/submit', {
+                            data: JSON.stringify(this.formData)
+                        })
+
+                        if (code === 0) {
+                            this.$message.success("报名成功")
+                            this.isSignUp = true
+                            this.dialogVisible = false
+                            this.$emit("refresh", null)
+                        } else {
+                            this.$message.error(msg || "报名失败")
+                        }
+                    } catch (error) {
+                        this.$message.error("操作失败")
+                    } finally {
+                        this.submitLoading = false;
+                    }
+                }).catch(() => {
+                    this.submitLoading = false;
+                })
+            } catch (error) {
+                this.$message.error("操作失败")
+                this.submitLoading = false;
+            }
+        },
+
+    }
+}

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

@@ -12,7 +12,8 @@ layout("/layouts/platform.html"){
                 <el-descriptions-item label="职工姓名">{{formData.userName}}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{formData.sex}}</el-descriptions-item>
                 <el-descriptions-item label="民族">{{formData.nation}}</el-descriptions-item>
-                <el-descriptions-item label="出生年月" >{{formData.birthday}}</el-descriptions-item>
+                <!-- 修改出生年月的显示方式 -->
+                <el-descriptions-item label="出生年月">{{formatDate(formData.birthday)}}</el-descriptions-item>
                 <el-descriptions-item label="工作单位" >{{formData.unitName}}</el-descriptions-item>
                 <el-descriptions-item label="电话" >{{formData.mobile}}</el-descriptions-item>
 
@@ -60,41 +61,45 @@ layout("/layouts/platform.html"){
 
             <table-tool label="假期类别"></table-tool>
             <el-descriptions :column="2" border>
-                <el-descriptions-item label="陪产假" v-if="formData.sex === '男性' || formData.sex === '男'">
+                <el-descriptions-item label="陪产假" v-if="isMale">
                     <el-form-item label="陪产假" prop="withLeave">
                         <el-input v-model="formData.withLeave" placeholder="请输入陪产天数"
-                                  type="number"></el-input>
+                                  type="number" :disabled="true"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="育儿假" v-if="formData.sex === '男性' || formData.sex === '男'">
+                <el-descriptions-item label="育儿假" v-if="isMale">
                     <el-form-item label="育儿假" prop="parentalLeave">
                         <el-input v-model="formData.parentalLeave" placeholder="请输入育儿假天数"
-                                  type="number"></el-input>
+                                  type="number" :disabled="true"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="产假" v-if="formData.sex === '女性' || formData.sex === '女'">
+                <el-descriptions-item label="产假" v-if="isFemale">
                     <el-form-item label="产假" prop="maternityLeave">
                         <el-input v-model="formData.maternityLeave" placeholder="请输入产假天数"
-                                  type="number"></el-input>
+                                  type="number" :disabled="true"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="延长假" v-if="formData.sex === '女性' || formData.sex === '女'">
+                <el-descriptions-item label="延长假" v-if="isFemale">
                     <el-form-item label="延长假" prop="extendLeave">
                         <el-input v-model="formData.extendLeave" placeholder="请输入延长假天数"
-                                  type="number"></el-input>
+                                  type="number" :disabled="true"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="多胞胎" v-if="formData.sex === '女性' || formData.sex === '女'">
+                <el-descriptions-item label="多胞胎" v-if="isFemale">
                     <el-form-item label="多胞胎" prop="birthsLeave">
-                        <el-input v-model="formData.birthsLeave" placeholder="请输入多胞胎天数"
-                                  type="number"></el-input>
+                        <el-select v-model="formData.birthsLeave" placeholder="请选择多胞胎天数"
+                                   clearable style="width: 100%">
+                            <el-option label="15" :value="15"></el-option>
+                        </el-select>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="难产假" v-if="formData.sex === '女性' || formData.sex === '女'">
+                <el-descriptions-item label="难产假" v-if="isFemale">
                     <el-form-item label="难产假" prop="difficultLeave">
-                        <el-input v-model="formData.difficultLeave" placeholder="请输入难产假天数"
-                                  type="number"></el-input>
+                        <el-select v-model="formData.difficultLeave" placeholder="请选择难产假天数"
+                                   clearable style="width: 100%">
+                            <el-option label="15" :value="15"></el-option>
+                        </el-select>
                     </el-form-item>
                 </el-descriptions-item>
 
@@ -198,14 +203,92 @@ layout("/layouts/platform.html"){
                 });
 
                 return total;
-            }
+            },
+            // 是否为男性
+            isMale() {
+                return this.formData.sex === '男性' || this.formData.sex === '男';
+            },
+            // 是否为女性
+            isFemale() {
+                return this.formData.sex === '女性' || this.formData.sex === '女';
+            },
         },
         watch: {
             totalLeaveDays(newVal) {
                 this.$set(this.formData, 'leaveDays', newVal);
+                // 当合计天数或开始时间变化时，自动计算结束时间
+                this.calculateEndTime();
+            },
+            'formData.startTime'() {
+                // 当开始时间变化时，自动计算结束时间
+                this.calculateEndTime();
+            },
+            // 监听性别变化，设置默认值
+            isMale(newVal) {
+                if (newVal) {
+                    // 男性默认设置
+                    this.$set(this.formData, 'loverSex', '女性');
+                    this.$set(this.formData, 'withLeave', 15);
+                    this.$set(this.formData, 'parentalLeave', 10);
+                }
+            },
+            isFemale(newVal) {
+                if (newVal) {
+                    // 女性默认设置
+                    this.$set(this.formData, 'loverSex', '男性');
+                    this.$set(this.formData, 'maternityLeave', 98);
+                    this.$set(this.formData, 'extendLeave', 60);
+                }
             }
         },
         methods: {
+            // 添加日期格式化方法
+            formatDate(date) {
+                if (!date) return '';
+                // 如果已经是 yyyy-MM-dd 格式，直接返回
+                if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
+                    // 如果包含时间，只取日期部分
+                    if (date.length > 10) {
+                        return date.substring(0, 10);
+                    }
+                    return date;
+                }
+                // 否则转换为 yyyy-MM-dd 格式
+                try {
+                    const d = new Date(date);
+                    if (isNaN(d.getTime())) {
+                        return date;
+                    }
+                    const year = d.getFullYear();
+                    const month = String(d.getMonth() + 1).padStart(2, '0');
+                    const day = String(d.getDate()).padStart(2, '0');
+                    return year + '-' + month + '-' + day;
+                } catch (e) {
+                    return date;
+                }
+            },
+            // 计算休假时间止
+            calculateEndTime() {
+                // 如果是男性，则不自动计算结束时间
+                if (this.isMale) {
+                    return;
+                }
+                if (this.formData.startTime && this.formData.leaveDays) {
+                    const startDate = new Date(this.formData.startTime);
+                    if (!isNaN(startDate.getTime())) {
+                        // 创建新的日期对象，避免修改原始日期
+                        const endDate = new Date(startDate);
+                        // 添加天数（leaveDays - 1，因为包含开始日期）
+                        endDate.setDate(endDate.getDate() + this.formData.leaveDays - 1);
+                        // 格式化为 yyyy-MM-dd
+                        const year = endDate.getFullYear();
+                        const month = String(endDate.getMonth() + 1).padStart(2, '0');
+                        const day = String(endDate.getDate()).padStart(2, '0');
+                        // 使用字符串拼接代替模板字符串，避免与Beetl冲突
+                        this.$set(this.formData, 'endTime', year + '-' + month + '-' + day);
+                    }
+                }
+            },
             // 保存
             onSave() {
                 this.$confirm("您确定保存吗？", "提示", {
@@ -301,9 +384,27 @@ layout("/layouts/platform.html"){
                         birthday: birthday,
                         mobile:mobile
                     }
+                    console.log('FormData birthday:', this.formData.birthday);
 
+                    // 根据性别设置默认值
+                    if (this.isMale) {
+                        // 男性默认设置
+                        this.$set(this.formData, 'loverSex', '女性');
+                        this.$set(this.formData, 'withLeave', 15);
+                        this.$set(this.formData, 'parentalLeave', 10);
+                        // 男性默认产假和延长假为0，因为男性不休产假
+                        this.$set(this.formData, 'maternityLeave', 0);
+                        this.$set(this.formData, 'extendLeave', 0);
+                    } else if (this.isFemale) {
+                        // 女性默认设置
+                        this.$set(this.formData, 'loverSex', '男性');
+                        this.$set(this.formData, 'maternityLeave', 98);
+                        this.$set(this.formData, 'extendLeave', 60);
+                        // 女性默认陪产假和育儿假为0
+                        this.$set(this.formData, 'withLeave', 0);
+                        this.$set(this.formData, 'parentalLeave', 0);
+                    }
                 }
-
             }
         },
         created() {

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

@@ -10,15 +10,13 @@ const maternityLeaveInfo = {
                 <el-descriptions-item label="职工姓名">{{viewData.userName}}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
                 <el-descriptions-item label="民族">{{viewData.nation}}</el-descriptions-item>
-                <el-descriptions-item label="出生年月">{{viewData.birthday}}</el-descriptions-item>
-                <el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
+                <el-descriptions-item label="出生年月">{{formatDate(viewData.birthday)}}</el-descriptions-item>                <el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
                 <el-descriptions-item label="电话">{{viewData.mobile}}</el-descriptions-item>
 
                 <el-descriptions-item label="爱人姓名">{{viewData.loverName}}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{viewData.loverSex}}</el-descriptions-item>
                 <el-descriptions-item label="民族">{{viewData.loverNation}}</el-descriptions-item>
-                <el-descriptions-item label="出生年月">{{viewData.loverBirthday}}</el-descriptions-item>
-                <el-descriptions-item label="单位" span="2">{{viewData.loverUnitName}}</el-descriptions-item>
+                <el-descriptions-item label="出生年月">{{formatDate(viewData.loverBirthday)}}</el-descriptions-item>                <el-descriptions-item label="单位" span="2">{{viewData.loverUnitName}}</el-descriptions-item>
             </el-descriptions>
             <table-tool label="假期类型"></table-tool>
             <el-descriptions :column="2" border class="flow-task-form">
@@ -43,10 +41,10 @@ const maternityLeaveInfo = {
                 <el-descriptions-item label="寒假">{{viewData.winterLeave}}</el-descriptions-item>
                 <el-descriptions-item label="暑假">{{viewData.summerLeave}}</el-descriptions-item>
                 <el-descriptions-item label="合计" :span="2">{{viewData.leaveDays}}</el-descriptions-item>
-            
-                <el-descriptions-item label="休假时间起">{{viewData.startTime}}</el-descriptions-item>
-                <el-descriptions-item label="休假时间止">{{viewData.endTime}}</el-descriptions-item>
-                <el-descriptions-item label="子女出生日">{{viewData.childrenBirthday}}</el-descriptions-item>
+
+                <el-descriptions-item label="休假时间起">{{formatDate(viewData.startTime)}}</el-descriptions-item>
+                <el-descriptions-item label="休假时间止">{{formatDate(viewData.endTime)}}</el-descriptions-item>
+                <el-descriptions-item label="子女出生日">{{formatDate(viewData.childrenBirthday)}}</el-descriptions-item>
             </el-descriptions>
 
             <template v-for="task in doneTasks">
@@ -101,6 +99,31 @@ const maternityLeaveInfo = {
         }
     },
     methods: {
+        // 添加日期格式化方法
+        formatDate(date) {
+            if (!date) return '';
+            // 如果已经是 yyyy-MM-dd 格式，直接返回
+            if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
+                // 如果包含时间，只取日期部分
+                if (date.length > 10) {
+                    return date.substring(0, 10);
+                }
+                return date;
+            }
+            // 否则转换为 yyyy-MM-dd 格式
+            try {
+                const d = new Date(date);
+                if (isNaN(d.getTime())) {
+                    return date;
+                }
+                const year = d.getFullYear();
+                const month = String(d.getMonth() + 1).padStart(2, '0');
+                const day = String(d.getDate()).padStart(2, '0');
+                return year + '-' + month + '-' + day;
+            } catch (e) {
+                return date;
+            }
+        },
         // 打开
         onOpen(row) {
             this.row = row

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

@@ -35,6 +35,7 @@ layout("/layouts/platform.html"){
                         <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
                         </el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+                        <el-button @click="doExportApply(row)" size="mini" type="primary">申请表导出</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -69,6 +70,10 @@ layout("/layouts/platform.html"){
         }
         ,
         methods: {
+            // 导出示例
+            doExportApply(row){
+                this.$downLoad('/platform/maternityLeave/mine/doExportApply?id=' + row.id)
+            },
             onView(row) {
                 this.$refs.guava.view(()=>{
                     this.$refs.maternityLeaveInfoRef.onOpen(row)

src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js

@@ -24,13 +24,16 @@ const COMMON_QUERY = {
 				    </el-select>
 			    </search-item>
 			    <search-item label="在职状态">
-				    <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
+				    <dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
+				                 code="USER_STATE" multiple collapse-tags></dict-select>
 			    </search-item>
-			    <search-item label="聘用方式">
-				    <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
+			    <search-item label="人事编制">
+				    <dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
+				                 code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
 			    </search-item>
 			    <search-item label="人员类型">
-				    <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
+				    <dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
+				                 code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
 			    </search-item>
 		    </template>
 	    </search>
@@ -45,14 +48,19 @@ const COMMON_QUERY = {
                 searchKeyword: '',
                 unionId: '',
                 unitId: '',
-                userState: '',
-                personType: ''
+                userStates: [],
+                personTypes: [],
+                preparedBys: [],
             }
         }
     },
     methods: {
         doSearch(){
-            this.$emit('search', this.pageForm)
+            const pageForm = clone(this.pageForm)
+            pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+            pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
+            pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
+            this.$emit('search', pageForm)
         },
         async initData(){
             if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {

src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html

@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
 				<el-descriptions-item label="性别">
 					<el-form-item prop="sex">
 						<el-radio-group v-model="formData.sex" size="small">
-							<el-radio border label="男性">男</el-radio>
-							<el-radio border label="女性">女</el-radio>
+							<el-radio border label="男">男</el-radio>
+							<el-radio border label="女">女</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-descriptions-item>

src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html

@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
                         <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
                     </search-item>
                     <search-item label="聘用方式">
-                        <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
+                        <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js

@@ -19,20 +19,16 @@ const COMMON_QUERY = {
 			    </el-select>
 		    </search-item>
 		    <search-item label="在职状态">
-			    <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
-			                 code="USER_STATE"></dict-select>
+			    <dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
+			                 code="USER_STATE" multiple collapse-tags></dict-select>
 		    </search-item>
 		    <search-item label="人事编制">
-			    <dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
-			                 code="PREPARED_BY"></dict-select>
+			    <dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
+			                 code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
 		    </search-item>
 		    <search-item label="人员类型">
-			    <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
-			                 code="USER_PERSON_TYPE"></dict-select>
-		    </search-item>
-		    <search-item label="变更类型">
-			    <dict-select v-model="pageForm.changeType" placeholder="人员类型" @change="doSearch"
-			                 code="MEMBER_CHANGE_TYPE"></dict-select>
+			    <dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
+			                 code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
 		    </search-item>
 	    </search>
     `,
@@ -45,14 +41,19 @@ const COMMON_QUERY = {
                 searchKeyword: '',
                 unionId: '',
                 unitId: '',
-                userState: '',
-                personType: ''
+                userStates: [],
+                personTypes: [],
+                preparedBys: [],
             }
         }
     },
     methods: {
         doSearch(){
-            this.$emit('search', this.pageForm)
+            const pageForm = clone(this.pageForm)
+            pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+            pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
+            pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
+            this.$emit('search', pageForm)
         },
         async initData(){
             if (this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN, SCHOOL_UNION_MEMBER_ADMIN")) {

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js

@@ -18,8 +18,8 @@ const MEMBER_CHANGE = {
 			        <el-descriptions-item label="性别">
 				        <el-form-item prop="sex">
 					        <el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-						        <el-radio border label="男性">男</el-radio>
-						        <el-radio border label="女性">女</el-radio>
+						        <el-radio border label="男">男</el-radio>
+						        <el-radio border label="女">女</el-radio>
 					        </el-radio-group>
 				        </el-form-item>
 			        </el-descriptions-item>

src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html

@@ -14,8 +14,8 @@
 			<el-descriptions-item label="性别">
 				<el-form-item prop="sex">
 					<el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-						<el-radio border label="男性">男</el-radio>
-						<el-radio border label="女性">女</el-radio>
+						<el-radio border label="男">男</el-radio>
+						<el-radio border label="女">女</el-radio>
 					</el-radio-group>
 				</el-form-item>
 			</el-descriptions-item>

src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html

@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
 				<el-descriptions-item label="性别">
 					<el-form-item prop="sex">
 						<el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-							<el-radio border label="男性">男</el-radio>
-							<el-radio border label="女性">女</el-radio>
+							<el-radio border label="男">男</el-radio>
+							<el-radio border label="女">女</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-descriptions-item>

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js

@@ -21,7 +21,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
                 </search-item>
                 <search-item label="聘用方式">
                     <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                 code="PREPARED_BY"></dict-select>
+                                 code="USER_PREPARED_BY_TYPE"></dict-select>
                 </search-item>
                 <search-item label="人员类型">
                     <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js

@@ -19,7 +19,7 @@ const VIEW_CHANGE_TYPE_USER = {
                     </search-item>
                     <search-item label="聘用方式">
                         <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js

@@ -34,7 +34,7 @@ const VERIFICATION_SET_USER_LIST = {
                     </search-item>
                     <search-item label="聘用方式">
                         <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="变更类型">
                         <dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js

@@ -28,7 +28,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
                             </search-item>
                             <search-item label="聘用方式">  
                                 <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                             code="PREPARED_BY"></dict-select>
+                                             code="USER_PREPARED_BY_TYPE"></dict-select>
                             </search-item>
                             <search-item label="人员类型">
                                 <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"

src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html

@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
                     </search-item>
                     <search-item label="人事编制">
                         <dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"

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

@@ -74,17 +74,17 @@ layout("/layouts/platform_h5.html"){
 
             <van-cell-group title="假期类型" class="form-section">
                 <van-field label="陪产假" v-model="formData.withLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '男性' || formData.sex === '男'" required></van-field>
+                           v-if="isMale" required></van-field>
                 <van-field label="育儿假" v-model="formData.parentalLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '男性' || formData.sex === '男'" required></van-field>
+                           v-if="isMale" required></van-field>
                 <van-field label="产假" v-model="formData.maternityLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
+                           v-if="isFemale" required></van-field>
                 <van-field label="延长假" v-model="formData.extendLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
+                           v-if="isFemale" required></van-field>
                 <van-field label="多胞胎" v-model="formData.birthsLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
+                           v-if="isFemale" required></van-field>
                 <van-field label="难产假" v-model="formData.difficultLeave" placeholder="请输入天数" type="number"
-                           v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
+                           v-if="isFemale" required></van-field>
                 <van-field label="寒假" v-model="formData.winterLeave" placeholder="请输入天数"
                            type="number" required></van-field>
                 <van-field label="暑假" v-model="formData.summerLeave" placeholder="请输入天数"
@@ -180,8 +180,8 @@ layout("/layouts/platform_h5.html"){
                 showStartTimePicker: false,
                 showEndTimePicker: false,
                 showChildrenBirthdayPicker: false,
-                minDate: new Date(1950, 0, 1), // 设置最小日期为2000年1月1日
-                maxDate: new Date(2040, 12, 31), // 设置最大日期为2030年12月31日
+                minDate: new Date(1950, 0, 1), // 设置最小日期为1950年1月1日
+                maxDate: new Date(2040, 12, 31), // 设置最大日期为2040年12月31日
                 // 表单验证规则
                 formRules: {
                     loverName: [{ required: true, message: '请输入爱人姓名' }],
@@ -225,9 +225,91 @@ layout("/layouts/platform_h5.html"){
                 // 同时更新 formData.leaveDays，以便保存到后端
                 this.$set(this.formData, 'leaveDays', total);
                 return total;
+            },
+            // 是否为男性
+            isMale() {
+                return this.formData.sex === '男性' || this.formData.sex === '男';
+            },
+            // 是否为女性
+            isFemale() {
+                return this.formData.sex === '女性' || this.formData.sex === '女';
+            }
+        },
+        watch: {
+            totalLeaveDays(newVal) {
+                this.$set(this.formData, 'leaveDays', newVal);
+                // 当合计天数或开始时间变化时，自动计算结束时间
+                this.calculateEndTime();
+            },
+            'formData.startTime'() {
+                // 当开始时间变化时，自动计算结束时间
+                this.calculateEndTime();
+            },
+            // 监听性别变化，设置默认值
+            isMale(newVal) {
+                if (newVal) {
+                    // 男性默认设置
+                    this.$set(this.formData, 'loverSex', '女性');
+                    this.$set(this.formData, 'withLeave', 15);
+                    this.$set(this.formData, 'parentalLeave', 10);
+                }
+            },
+            isFemale(newVal) {
+                if (newVal) {
+                    // 女性默认设置
+                    this.$set(this.formData, 'loverSex', '男性');
+                    this.$set(this.formData, 'maternityLeave', 98);
+                    this.$set(this.formData, 'extendLeave', 60);
+                }
             }
         },
         methods: {
+            // 格式化日期为 yyyy-MM-dd 格式
+            formatDate(date) {
+                if (!date) return '';
+                // 如果已经是 yyyy-MM-dd 格式，直接返回
+                if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
+                    // 如果包含时间，只取日期部分
+                    if (date.length > 10) {
+                        return date.substring(0, 10);
+                    }
+                    return date;
+                }
+                // 否则转换为 yyyy-MM-dd 格式
+                try {
+                    const d = new Date(date);
+                    if (isNaN(d.getTime())) {
+                        return date;
+                    }
+                    const year = d.getFullYear();
+                    const month = String(d.getMonth() + 1).padStart(2, '0');
+                    const day = String(d.getDate()).padStart(2, '0');
+                    return year + '-' + month + '-' + day;
+                } catch (e) {
+                    return date;
+                }
+            },
+            // 计算休假时间止
+            calculateEndTime() {
+                // 如果是男性，则不自动计算结束时间
+                if (this.isMale) {
+                    return;
+                }
+                if (this.formData.startTime && this.formData.leaveDays) {
+                    const startDate = new Date(this.formData.startTime);
+                    if (!isNaN(startDate.getTime())) {
+                        // 创建新的日期对象，避免修改原始日期
+                        const endDate = new Date(startDate);
+                        // 添加天数（leaveDays - 1，因为包含开始日期）
+                        endDate.setDate(endDate.getDate() + this.formData.leaveDays - 1);
+                        // 格式化为 yyyy-MM-dd
+                        const year = endDate.getFullYear();
+                        const month = String(endDate.getMonth() + 1).padStart(2, '0');
+                        const day = String(endDate.getDate()).padStart(2, '0');
+                        this.$set(this.formData, 'endTime', year + '-' + month + '-' + day);
+                    }
+                }
+            },
             async onSave() {
                 // 保存时不需要验证，直接提交数据
                 this.$axios.post("/platform/maternityLeave/apply/save", {data: JSON.stringify(this.formData)})
@@ -298,7 +380,7 @@ layout("/layouts/platform_h5.html"){
                     }
                 }
 
-                // 所人性别都需要填写的字段
+                // 所有人需要填写的字段
                 if (!this.formData.winterLeave && this.formData.winterLeave !== 0) {
                     errors.push('请输入寒假天数');
                 }
@@ -373,26 +455,26 @@ layout("/layouts/platform_h5.html"){
                 });
             },
 
-            // 出生日期确认事件
+            // 出生日期确认事件 - 格式化为 yyyy-MM-dd
             onLoverBirthdayConfirm(value) {
-                this.$set(this.formData, "loverBirthday", this.$moment(value).format("YYYY-MM-DD"));
+                this.$set(this.formData, "loverBirthday", this.formatDate(value));
                 this.showLoverBirthdayPicker = false;
             },
-            // 休假开始时间确认事件
+            // 休假开始时间确认事件 - 格式化为 yyyy-MM-dd
             onStartTimeConfirm(value) {
-                this.$set(this.formData, "startTime", this.$moment(value).format("YYYY-MM-DD"));
+                this.$set(this.formData, "startTime", this.formatDate(value));
                 this.showStartTimePicker = false;
             },
 
-            // 休假结束时间确认事件
+            // 休假结束时间确认事件 - 格式化为 yyyy-MM-dd
             onEndTimeConfirm(value) {
-                this.$set(this.formData, "endTime", this.$moment(value).format("YYYY-MM-DD"));
+                this.$set(this.formData, "endTime", this.formatDate(value));
                 this.showEndTimePicker = false;
             },
 
-            // 子女出生日期确认事件
+            // 子女出生日期确认事件 - 格式化为 yyyy-MM-dd
             onChildrenBirthdayConfirm(value) {
-                this.$set(this.formData, "childrenBirthday", this.$moment(value).format("YYYY-MM-DD"));
+                this.$set(this.formData, "childrenBirthday", this.formatDate(value));
                 this.showChildrenBirthdayPicker = false;
             },
 
@@ -435,6 +517,31 @@ layout("/layouts/platform_h5.html"){
                                     this.$set(this.formData, "loverNation", matched.value)
                                 }
                             }
+
+                            // 格式化所有日期字段，确保不包含时分秒
+                            const dateFields = ['birthday', 'loverBirthday', 'startTime', 'endTime', 'childrenBirthday'];
+                            dateFields.forEach(field => {
+                                if (this.formData[field]) {
+                                    this.$set(this.formData, field, this.formatDate(this.formData[field]));
+                                }
+                            });
+
+                            // 根据性别设置默认值
+                            if (this.isMale) {
+                                // 男性默认设置
+                                if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 15);
+                                if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 10);
+                                // 男性默认产假和延长假为0
+                                if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 0);
+                                if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 0);
+                            } else if (this.isFemale) {
+                                // 女性默认设置
+                                if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 98);
+                                if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 60);
+                                // 女性默认陪产假和育儿假为0
+                                if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 0);
+                                if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 0);
+                            }
                         }
                     })
                 } else {
@@ -448,8 +555,27 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "unionName", user.union.name)
                     this.$set(this.formData, "sex", user.sex)
                     this.$set(this.formData, "nation", user.nation)
-                    this.$set(this.formData, "birthday", user.birthday)
+                    this.$set(this.formData, "birthday", this.formatDate(user.birthday)) // 格式化日期
                     this.$set(this.formData, "mobile", user.mobile)
+
+                    // 根据性别设置默认值
+                    if (this.isMale) {
+                        // 男性默认设置
+                        this.$set(this.formData, 'loverSex', '女性');
+                        this.$set(this.formData, 'withLeave', 15);
+                        this.$set(this.formData, 'parentalLeave', 10);
+                        // 男性默认产假和延长假为0
+                        this.$set(this.formData, 'maternityLeave', 0);
+                        this.$set(this.formData, 'extendLeave', 0);
+                    } else if (this.isFemale) {
+                        // 女性默认设置
+                        this.$set(this.formData, 'loverSex', '男性');
+                        this.$set(this.formData, 'maternityLeave', 98);
+                        this.$set(this.formData, 'extendLeave', 60);
+                        // 女性默认陪产假和育儿假为0
+                        this.$set(this.formData, 'withLeave', 0);
+                        this.$set(this.formData, 'parentalLeave', 0);
+                    }
                 }
             }
         },

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

@@ -3,17 +3,17 @@ const MATERNITY_LEAVE_INFO = {
     /*language=HTML*/`
             <van-action-sheet v-model="visible" title="查看详情">
             <div class="detail-container">
-                <van-cell-group title="人员信息">
+               <van-cell-group title="人员信息">
                     <van-cell title="职工姓名">{{ viewData.userName }}</van-cell>
                     <van-cell title="性别">{{ viewData.sex }}</van-cell>
                     <van-cell title="民族">{{ viewData.nation }}</van-cell>
-                    <van-cell title="出生年月">{{ viewData.birthday }}</van-cell>
+                    <van-cell title="出生年月">{{ formatDate(viewData.birthday) }}</van-cell>
                     <van-cell title="单位">{{ viewData.unitName }}</van-cell>
                     <van-cell title="电话">{{ viewData.mobile }}</van-cell>
                     <van-cell title="爱人姓名">{{ viewData.loverName }}</van-cell>
                     <van-cell title="性别">{{ viewData.loverSex }}</van-cell>
                     <van-cell title="民族">{{ viewData.loverNation }}</van-cell>
-                    <van-cell title="出生年月">{{ viewData.loverBirthday }}</van-cell>
+                    <van-cell title="出生年月">{{ formatDate(viewData.loverBirthday) }}</van-cell>
                     <van-cell title="单位">{{ viewData.loverUnitName }}</van-cell>
                     </van-cell-group> 
                      
@@ -27,11 +27,12 @@ const MATERNITY_LEAVE_INFO = {
                     <van-cell title="寒假">{{ viewData.winterLeave }}</van-cell>
                     <van-cell title="暑假">{{ viewData.summerLeave }}</van-cell>
                     <van-cell title="合计">{{ viewData.leaveDays }}</van-cell>
-                    <van-cell title="休假时间起">{{ viewData.startTime }}</van-cell>
-                    <van-cell title="休假时间止">{{ viewData.endTime }}</van-cell>
-                    <van-cell title="子女出生日">{{ viewData.childrenBirthday }}</van-cell>
+                    <van-cell title="休假时间起">{{ formatDate(viewData.startTime) }}</van-cell>
+                    <van-cell title="休假时间止">{{ formatDate(viewData.endTime) }}</van-cell>
+                    <van-cell title="子女出生日">{{ formatDate(viewData.childrenBirthday) }}</van-cell>
                     </van-cell-group> 
                     
+                    
                 <template v-for="(task,index) in doneTasks">
                     <div class="process-title">
                         {{ task.displayName }}
@@ -88,6 +89,31 @@ const MATERNITY_LEAVE_INFO = {
         }
     },
     methods: {
+        // 添加日期格式化方法
+        formatDate(date) {
+            if (!date) return '';
+            // 如果已经是 yyyy-MM-dd 格式，直接返回
+            if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
+                // 如果包含时间，只取日期部分
+                if (date.length > 10) {
+                    return date.substring(0, 10);
+                }
+                return date;
+            }
+            // 否则转换为 yyyy-MM-dd 格式
+            try {
+                const d = new Date(date);
+                if (isNaN(d.getTime())) {
+                    return date;
+                }
+                const year = d.getFullYear();
+                const month = String(d.getMonth() + 1).padStart(2, '0');
+                const day = String(d.getDate()).padStart(2, '0');
+                return year + '-' + month + '-' + day;
+            } catch (e) {
+                return date;
+            }
+        },
         onOpen(row) {
             this.row = row
             this.visible = true