From e6cf2df9374bf3392b624fe0f37c3b51edfbfeb9 Mon Sep 17 00:00:00 2001 From: Paidax Date: Wed, 24 Sep 2025 09:49:52 +0800 Subject: [PATCH] commit --- .../com/budwk/app/sys/views/View_user.java | 19 + .../info/MemberBatchMakeController.java | 223 +++++++++ .../info/MemberDataManageController.java | 90 ++++ .../info/MemberInfoGroupController.java | 4 +- .../info/MemberInfoHistoryController.java | 2 +- .../member/param/MemberBatchMakeParam.java | 20 + .../member/param/MemberInfoPageForm.java | 59 --- .../param/pageform/MemberInfoPageForm.java | 82 +++ .../member/service/MemberInfoService.java | 2 +- .../service/impl/MemberInfoServiceImpl.java | 3 +- .../difficulthelp/apply/index.html | 3 +- .../staffmanage/member/apply/submit/form.html | 466 ++++++++++++++++++ .../member/change/common/memberChange.js | 7 +- .../member/common/info/memberInfo.js | 139 +++--- .../member/info/batchmake/index.html | 85 ++++ .../member/info/common/commonQuery.js | 88 ++++ .../staffmanage/member/info/data/index.html | 10 - .../member/info/datamanage/index.html | 73 +++ .../statistics/comprehensive/index.html | 2 +- 19 files changed, 1235 insertions(+), 142 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberDataManageController.java create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberBatchMakeParam.java delete mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberInfoPageForm.java create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js delete mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/info/data/index.html create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html diff --git a/src/main/java/com/budwk/app/sys/views/View_user.java b/src/main/java/com/budwk/app/sys/views/View_user.java index 3d61bcbf..81d6d0b8 100644 --- a/src/main/java/com/budwk/app/sys/views/View_user.java +++ b/src/main/java/com/budwk/app/sys/views/View_user.java @@ -180,4 +180,23 @@ public class View_user { @Column private String professionalLevel; + + @Column + private String jobCategory; + + @Column + private String employeeSource; + + @Column + private String administrativeLevel; + + @Column + private String positionSeries; + + @Column + private String administrativePositionLevel; + + @Column + private String expectedLeaveSchoolDate; + } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java new file mode 100644 index 00000000..28fcdc41 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java @@ -0,0 +1,223 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.info; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.DesensitizedUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.exception.BaseException; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.sys.models.Sys_role; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.models.Sys_user_role; +import com.budwk.app.sys.services.SysRoleService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.param.MemberBatchMakeParam; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberStatisticsPageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberBatchMakeController + * @Date 2025/9/23 16:51 + * @注释 批量设置会员 + */ +@IocBean +@Ok("json:full") +@At("/platform/member/info/batchMake") +public class MemberBatchMakeController { + + @Inject + private Dao dao; + @Inject + private SysRoleService sysRoleService; + @Inject + private MemberCommonService memberCommonService; + + @At("") + @SaCheckPermission("member.info.batchMake") + @Ok("beetl:/platform/zhgh/staffmanage/member/info/batchmake/index.html") + public void index() {} + + @At + @ApiOperation("查询非会员列表") + @SaCheckPermission("member.info.batchMake") + public Result pageData(MemberInfoPageForm pageForm){ + Sql sql = Sqls.create(""" + SELECT + id, + loginname, + username, + sex, + userState, + personType, + preparedBy, + unionName, + unitName, + mobile + from + `user` + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("member", "=", false); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", pageForm.getSearchKeyword()); + seg.orLike("loginname", pageForm.getSearchKeyword()); + cnd.and(seg); + } + + // 权限判断 + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("unionId", "=", SecurityUtil.getUnionId()); + seg.or("unionId", "is", null); + seg.or("unionId", "=", ""); + cnd.and(seg); + } else { + cnd.andEX("unionId", "=", pageForm.getUnionId()); + cnd.andEX("unitId", "=", pageForm.getUnitId()); + } + + cnd.andEX("userState", "in", pageForm.getUserStates()); + cnd.andEX("preparedBy", "in", pageForm.getPreparedBys()); + cnd.andEX("personType", "in", pageForm.getPersonTypes()); + + sql.setCondition(cnd); + + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + + @At + @ApiOperation("批量设置会员") + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "会员信息", msg = "批量设置会员") + @SaCheckPermission("member.info.batchMake") + public Result batchMake(MemberBatchMakeParam param){ + List userIds = param.getUserIds(); + // 查询会员角色 + Sys_role role = sysRoleService.getByCode(RoleConstant.MEMBER); + if (role == null) { + throw new BaseException("会员角色不存在"); + } + + dao.update(Sys_user.class, Chain.make("member", true) + .addSpecial("memberTime", DateUtil.now()), + Cnd.where("id", "in", userIds)); + + // 添加会员角色 + List roleList = userIds.stream().map(v -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(v); + userRole.setRoleId(role.getId()); + return userRole; + }).toList(); + dao.insert(roleList); + + return Result.success(); + } + + + @At + @Ok("void") + @SaCheckPermission("member.statistics.comprehensive") + public void doExport(MemberStatisticsPageForm pageForm, HttpServletResponse response){ + Sql sql = Sqls.create(""" + SELECT + id, + loginname, + username, + sex, + userState, + personType, + preparedBy, + unionName, + unitName, + mobile + from + `user` + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("member", "=", false); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", pageForm.getSearchKeyword()); + seg.orLike("loginname", pageForm.getSearchKeyword()); + cnd.and(seg); + } + + // 权限判断 + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("unionId", "=", SecurityUtil.getUnionId()); + seg.or("unionId", "is", null); + seg.or("unionId", "=", ""); + cnd.and(seg); + } else { + cnd.andEX("unionId", "=", pageForm.getUnionId()); + cnd.andEX("unitId", "=", pageForm.getUnitId()); + } + + cnd.andEX("userState", "in", pageForm.getUserStates()); + cnd.andEX("preparedBy", "in", pageForm.getPreparedBys()); + cnd.andEX("personType", "in", pageForm.getPersonTypes()); + + sql.setCondition(cnd); + List list = memberCommonService.listMap(sql); + for (NutMap row : list) { + row.put("mobile", DesensitizedUtil.mobilePhone(row.getString("mobile"))); + } + try { + List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); + exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); + exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); + exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); + exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); + exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20)); + exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); + exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); + + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + CommonDownloadUtil.download("非会员列表.xlsx", workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberDataManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberDataManageController.java new file mode 100644 index 00000000..13b622ca --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberDataManageController.java @@ -0,0 +1,90 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.info; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberDataManageController + * @Date 2025/9/23 17:55 + * @注释 数据管理工具 + */ +@IocBean +@Ok("json:full") +@At("/platform/member/info/dataManage") +public class MemberDataManageController { + + @At("") + @SaCheckPermission("member.info.dataManage") + @Ok("beetl:/platform/zhgh/staffmanage/member/info/datamanage/index.html") + public void index() {} + + + @At + @ApiOperation("数据管理工具") + @SaCheckPermission("member.info.dataManage") + public Result pageData(MemberInfoPageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + id, + loginname, + username, + sex, + userState, + personType, + preparedBy, + unionName, + unitName, + mobile + from + `user` + $condition + """); + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", pageForm.getSearchKeyword()); + seg.orLike("loginname", pageForm.getSearchKeyword()); + cnd.and(seg); + } + + // 权限判断 + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("unionId", "=", SecurityUtil.getUnionId()); + seg.or("unionId", "is", null); + seg.or("unionId", "=", ""); + cnd.and(seg); + } else { + cnd.andEX("unionId", "=", pageForm.getUnionId()); + cnd.andEX("unitId", "=", pageForm.getUnitId()); + } + + cnd.andEX("userState", "in", pageForm.getUserStates()); + cnd.andEX("preparedBy", "in", pageForm.getPreparedBys()); + cnd.andEX("personType", "in", pageForm.getPersonTypes()); + + if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } else { + cnd.asc("unitcode").asc("loginname"); + } + sql.setCondition(cnd); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java index 82fcb814..f48ad45e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java @@ -8,7 +8,7 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.zhgh.staffmanage.member.models.MemberHistory; -import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService; import com.budwk.app.zhgh.staffmanage.member.vo.MemberImportVo; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,6 @@ import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.AdaptBy; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; import org.nutz.mvc.upload.TempFile; import org.nutz.mvc.upload.UploadAdaptor; @@ -31,7 +30,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.List; /** * @version 1.0 diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoHistoryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoHistoryController.java index 6488508c..6fdfe510 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoHistoryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoHistoryController.java @@ -6,7 +6,7 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.models.Sys_union; -import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberBatchMakeParam.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberBatchMakeParam.java new file mode 100644 index 00000000..4b358a42 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberBatchMakeParam.java @@ -0,0 +1,20 @@ +package com.budwk.app.zhgh.staffmanage.member.param; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberBatchMakeParam + * @Date 2025/9/23 17:10 + * @注释 + */ +@Data +public class MemberBatchMakeParam { + + @NotEmpty(message = "设置人员不能为空") + private List userIds; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberInfoPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberInfoPageForm.java deleted file mode 100644 index 278520a8..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/MemberInfoPageForm.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.param; - -import com.budwk.app.base.param.PageForm; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberInfoPageForm - * @Date 2024/8/8 10:08 - * @注释 会员信息page - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class MemberInfoPageForm extends PageForm { - - private Integer year; - - private String unionId; - - private String unitId; - - private String threeUnitId; - - private String unionGroupId; - - private String userState; - - private String preparedBy; - - private String personType; - - private List personTypes; - - private List preparedBys; - - private List userStates; - - private String sex; - - private List sexTypes; - - private Integer memberStatus; - - private String position; - - private String jobTitle; - - private String memberSearchName; - - private String memberSearchKeyWord; - - private Integer pageNumber = 1; - - private Integer pageSize = 10; -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java new file mode 100644 index 00000000..a37c6add --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java @@ -0,0 +1,82 @@ +package com.budwk.app.zhgh.staffmanage.member.param.pageform; + +import com.budwk.app.base.param.PageForm; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberInfoPageForm + * @Date 2024/8/8 10:08 + * @注释 会员信息page + */ +@Data +@ApiModel("信息管理参数") +@EqualsAndHashCode(callSuper = true) +public class MemberInfoPageForm extends PageForm { + + @ApiModelProperty("年份") + private Integer year; + + @ApiModelProperty("性别") + private String sex; + + @ApiModelProperty("性别数组") + private List sexTypes; + + @ApiModelProperty("工会Id") + private String unionId; + + @ApiModelProperty("部门Id") + private String unitId; + + @ApiModelProperty("三级单位Id") + private String threeUnitId; + + @ApiModelProperty("工会小组Id") + private String unionGroupId; + + @ApiModelProperty("在职状态") + private String userState; + + @ApiModelProperty("编制类型") + private String preparedBy; + + @ApiModelProperty("人员类型") + private String personType; + + @ApiModelProperty("人员类型数组") + private List personTypes; + + @ApiModelProperty("编制类型数组") + private List preparedBys; + + @ApiModelProperty("在职状态数组") + private List userStates; + + @ApiModelProperty("会员状态") + private Integer memberStatus; + + @ApiModelProperty("职位") + private String position; + + @ApiModelProperty("职位") + private String jobTitle; + + @ApiModelProperty("会员搜索名称") + private String memberSearchName; + + @ApiModelProperty("会员搜索关键字") + private String memberSearchKeyWord; + + @ApiModelProperty("工号开头") + private String startLoginNames; + + @ApiModelProperty("工号结尾") + private String endLoginNames; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberInfoService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberInfoService.java index 225c1282..64f9c99b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberInfoService.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberInfoService.java @@ -2,7 +2,7 @@ package com.budwk.app.zhgh.staffmanage.member.service; import com.budwk.app.base.service.BaseService; import com.budwk.app.sys.models.Sys_user; -import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.sql.Sql; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java index b50bb686..c2dd3c17 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java @@ -17,7 +17,7 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.sys.models.Sys_user; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.staffmanage.member.models.MemberHistory; -import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService; import com.budwk.app.zhgh.staffmanage.member.vo.MemberImportVo; import org.apache.poi.ss.formula.functions.T; @@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.concurrent.*; import java.util.stream.Collectors; /** diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html index c5d96e12..1cee1c79 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html @@ -18,8 +18,7 @@ layout("/layouts/platform.html"){ - - @change="modeChange" style="width: 100%"> + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html new file mode 100644 index 00000000..80b8a0b7 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html @@ -0,0 +1,466 @@ +
+ + + + + + + + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 我自愿申请加入学校工会，并委托学校按规定代为扣缴工会会员会费。 + +
+
+ + 我将严格遵守工会章程，认真执行工会决议，积极参与工会活动，主动融入“学校健康幸福家”建设，为营造温暖、和谐、奋进的校园氛围贡献力量，以实际行动助力学校各项事业发展。 + +
+ + + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index 67bc171f..33f6b71d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -139,13 +139,18 @@ const MEMBER_CHANGE = { :disabled="allowFields('userState')" style="width: 100%"> + + + + + -