diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 55a0cc6..a883d8c 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -27,20 +27,7 @@ import java.util.List; @Slf4j public class MsgApi { - /** - * token -redis - name - */ - private static final String MSG_TOKEN_NAME = "msg_token"; - private static final String APP_KEY = "10c51794-45b8-4de5-ba6f-b1ed843c20f3"; - private static final String APP_SECRET = "4acbf17e-4b17-4c47-b4bb-1576a066250a"; - - /** - * 发送消息api - */ - private static final String MSG_API = "https://xxdb.hmc.edu.cn/msgInfo/pushMsgInfo"; - - private static final String TOKEN_API = "https://xxdb.hmc.edu.cn/accessSystem/getAccessToken"; @Inject private RedisService redisService; @@ -110,19 +97,20 @@ public class MsgApi { * @return */ private String getMsgToken() { - String token = redisService.get(MSG_TOKEN_NAME); - if (StrUtil.isBlank(token)) { - String body = HttpRequest.post(TOKEN_API + "?appKey=" + APP_KEY + "&appSecret=" + APP_SECRET).execute().body(); - NutMap map = Json.fromJson(NutMap.class, body); - if (map.getInt("code") == 200) { - NutMap data = Json.fromJson(NutMap.class, map.getString("data")); - token = data.getString("accessToken"); - redisService.setex(MSG_TOKEN_NAME, 3600, token); - } else { - token = ""; - } - } - return token; +// String token = redisService.get(MSG_TOKEN_NAME); +// if (StrUtil.isBlank(token)) { +// String body = HttpRequest.post(TOKEN_API + "?appKey=" + APP_KEY + "&appSecret=" + APP_SECRET).execute().body(); +// NutMap map = Json.fromJson(NutMap.class, body); +// if (map.getInt("code") == 200) { +// NutMap data = Json.fromJson(NutMap.class, map.getString("data")); +// token = data.getString("accessToken"); +// redisService.setex(MSG_TOKEN_NAME, 3600, token); +// } else { +// token = ""; +// } +// } +// return token; + return null; } diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index 9f4ce17..5bbde3f 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -105,26 +105,28 @@ public class SourceUserServiceImpl extends ViServiceImpl implements source.setLoginname(o.getString("ZGH")); source.setUsername(o.getString("XM")); source.setSex(o.getString("XB")); - source.setBirthday(o.getString("CSRQ")); - source.setSchoolTime(o.getString("JBXNY")); + source.setBirthday(StrUtil.isNotBlank(o.getString("CSRQ")) ? o.getString("CSRQ").substring(0, 10) : null); + source.setSchoolTime(StrUtil.isNotBlank(o.getString("JBXNY")) ? o.getString("JBXNY").substring(0, 10) : null); source.setUnitid(o.getString("DWDM")); source.setNation(o.getString("MZ")); source.setJobTitle(o.getString("DZZW")); source.setEducation(o.getString("XL")); source.setPullTime(new DateTime()); source.setMobile(o.getString("SJH")); - source.setUserState(o.getString("LXLX")); + source.setUserState(o.getString("DQZT")); source.setPolitical(o.getString("ZZMM")); - source.setIdcard(o.getString("SFZJH")); - source.setUserCategory(o.getString("JZGRYLB")); - source.setPersonType(o.getString("DQZT")); +// source.setIdcard(o.getString("SFZJH")); + source.setPreparedBy(o.getString("JZGRYLB")); + source.setPersonType(o.getString("LXLX")); return source; }).collect(Collectors.toList()); asyncService.exe2(users, (user) -> { - UserMode.initUser(user); }); - dao().insert(users); + + manyAddOrRenewUtil.asyncExecuteFastInsert(users, 200); + +// dao().insert(users); } @Override @@ -158,8 +160,6 @@ public class SourceUserServiceImpl extends ViServiceImpl implements List needDoUpdateList = new CopyOnWriteArrayList<>(); // 新增的用户 List needInitUserList = new CopyOnWriteArrayList<>(); - // 添加角色的用户 - List userRoles = new CopyOnWriteArrayList<>(); // 人员更新配置的对象 SourceChangeConfig changeConfig = dao().fetch(SourceChangeConfig.class, Cnd.NEW()); @@ -172,15 +172,9 @@ public class SourceUserServiceImpl extends ViServiceImpl implements List middleTables = new CopyOnWriteArrayList<>(); // 获取人员变更字段，用于存储记录 - List dictList = sysDictService.getSubListByCode("ALLOW_CHANGE_FIELDS"); - Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); - allowChangeFieldNames.add("member"); - allowChangeFieldNames.add("welfareMember"); - allowChangeFieldNames.add("unitid"); - Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); - dictMap.put("member", "会员状态"); - dictMap.put("welfareMember", "福利会员状态"); - dictMap.put("unitid", "单位"); + NutMap map = memberCommonService.getDictAllowChangeFields(); + Set allowChangeFieldNames = map.getAs("allowChangeFieldNames", Set.class); + Map dictMap = map.getAs("dictMap", Map.class); // 添加会员角色 List addMemberUserIds = new CopyOnWriteArrayList<>(); @@ -275,9 +269,13 @@ public class SourceUserServiceImpl extends ViServiceImpl implements //如果有新用户，增加到用户表同时增加角色 if (Lang.isNotEmpty(needInitUserList)) { sysUserService.fastInsert(needInitUserList); - List userIdList = userRoles.stream().map(Sys_user_role::getUserId).collect(Collectors.toList()); - sysUserRoleService.dao().clear(Sys_user_role.class, Cnd.where("userId", "in", userIdList)); - sysUserRoleService.insert(userRoles); + List roleList = needInitUserList.stream().map(item -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setRoleId(Roles.PUBLIC); + userRole.setUserId(item.getId()); + return userRole; + }).toList(); + manyAddOrRenewUtil.asyncExecuteFastInsert(roleList, 200); } // 添加会员 diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java index f711f39..e1f4697 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java @@ -7,11 +7,14 @@ import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysLocalProcessService; +import io.v.nutz.sys.services.SysUserService; +import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.staffmanage.member.handle.MemberApplyToDoHandler; @@ -35,6 +38,8 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import java.util.List; + /** * @version 1.0 * @Author zzr @@ -50,6 +55,10 @@ public class MemberApplyBranchUnionAuditController { @Inject private Dao dao; @Inject + private MsgApi msgApi; + @Inject + private SysUserService sysUserService; + @Inject private MemberCommonService memberCommonService; @Inject private SysLocalProcessService localProcessService; @@ -124,13 +133,15 @@ public class MemberApplyBranchUnionAuditController { record.setBranchUnionAuditId(audit.getId()); dao.updateIgnoreNull(record); + MemberApplyToDoHandler.COMPLETE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会审核完成")); + // 获取分配工会信息 + Sys_union union = dao.fetch(Sys_union.class, Cnd.where("id", "=", record.getAllocationUnionId())); if (audit.getAuditType() == 2) { MemberApplyToDoHandler.CREATE_APPLY_RE_MODIFY_TASK.exec(record, null); } else if (audit.getAuditType() == 1) { - MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null); // 判断是否改变了工会关系 - User user = dao.fetch(User.class, Cnd.where("id", "=", record.getUserId())); + if (!ObjectUtil.equals(user.getUnionid(), record.getAllocationUnionId())) { if (dao.count(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())) > 0) { dao.clear(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())); @@ -138,7 +149,6 @@ public class MemberApplyBranchUnionAuditController { } if (!ObjectUtil.equals(user.getUnionid(), record.getAllocationUnionId())) { - Sys_union union = dao.fetch(Sys_union.class, Cnd.where("id", "=", record.getAllocationUnionId())); SpecialStaff staff = new SpecialStaff(); staff.setUserId(record.getUserId()); staff.setPersonnelRelationUnitId(user.getUnitid()); @@ -155,10 +165,23 @@ public class MemberApplyBranchUnionAuditController { BeanUtil.copyProperties(record, sysUser); sysUser.setId(user.getId()); dao.updateIgnoreNull(sysUser); + + MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null); + String content = "尊敬的%s老师，您已正式成为杭医工会会员，会员关系在%s，欢迎您的加入！" + .formatted(user.getUsername(), union.getUnionname()); + System.out.println(content); + sysUserService.deleteCacheAndUpdate(record.getUserId()); + msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "入会结果通知", content, "", ""); } else { - MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会审核拒绝")); + // 杭州医学院，分工会拒绝接收，还要去创建校工会的审核任务 + MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会拒绝接收")); + MemberApplyToDoHandler.CREATE_SCHOOL_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核")); + String content = "工会主管您好，%s分拒绝接收%s老师，拒绝原因：%s，请您及时联系该分工会负责人或将工会关系划入其他工会。点击此消息或登录“智慧工会”可重新分配工会关系" + .formatted(union.getUnionname(), record.getUsername(), audit.getAuditOpinion()); + String linkUrl = Globals.AppDomain + "/platform/member/apply/schoolUnion/audit/h5"; + System.out.println(content); + msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 2, "入会结果通知", content, "", linkUrl); } - MemberApplyToDoHandler.COMPLETE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会审核完成")); return null; } @@ -170,11 +193,11 @@ public class MemberApplyBranchUnionAuditController { @SLog(type = "memberApply", tag = "会员入会申请", msg = "分工会撤回") public Object doRevoke(String id){ MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); - dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 20) + dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 50) .add("branchUnionAuditId", null), Cnd.where("id", "=", id)); dao.clear(Audit.class, Cnd.where("id", "=", record.getBranchUnionAuditId())); // 待办撤回 - localProcessService.revokeTask("MEMBER_APPLY@" + id, "分工会审核"); + localProcessService.revokeTask("MEMBER_APPLY@" + id, "分工会接收"); return null; } } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java index 101bfe5..ee5600f 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java @@ -3,7 +3,10 @@ package io.v.nutz.zhgh.staffmanage.member.controller.apply; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.MsgApi; +import io.v.nutz.base.utils.Roles; +import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.User; +import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.staffmanage.member.constant.MemberChangeOrigin; @@ -101,6 +104,12 @@ public class MemberApplyController { @RequiresPermissions("member.apply.submit") @SLog(tag = "会员入会申请", msg = "提交申请") public Object doSubmit(MemberApplyRecord record){ + + int count = dao.count(Sys_user_role.class, Cnd.where("userId", "=", record.getUserId()).and("roleId", "=", Roles.MEMBER)); + if (count > 0) { + return Result.error("您已经是会员，请勿重复申请"); + } + record.setMember(true); record.setUserId(ShiroUtil.getUserId()); record.setChangeOrigin(MemberChangeOrigin.PERSONAL.name()); @@ -119,11 +128,12 @@ public class MemberApplyController { MemberApplyToDoHandler.CREATE_SCHOOL_TASK.exec(record, null); // 短信通知 -// List schoolLoginNameList = commonService.getSchoolOrBranchUnionMemberAdminLoginNames("school", null); -// String schoolLoginNameListStr = schoolLoginNameList.stream().distinct().collect(Collectors.joining(",")); -// -// String content = "%s老师正申请加入工会，请您点击此条消息或前往智慧工会进行审核"; -// msgApi.sendMsg(List.of("DingTalk"), schoolLoginNameListStr, 2, "协会入会邀请", content, "", ""); + List schoolLoginNameList = commonService.getSchoolOrBranchUnionMemberAdminLoginNames("school", null); + String schoolLoginNameListStr = schoolLoginNameList.stream().distinct().collect(Collectors.joining(",")); + + String content = "%s老师正申请加入工会，请您点击此条消息或登录“智慧工会”进行审核".formatted(record.getUsername()); + String linkUrl = Globals.AppDomain + "/platform/member/apply/schoolUnion/audit/h5"; + msgApi.sendMsg(List.of("DingTalk"), schoolLoginNameListStr, 2, "入会审核通知", content, "", linkUrl); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java index 606024a..d90fac9 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java @@ -5,7 +5,9 @@ import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.sys.services.SysLocalProcessService; +import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.staffmanage.member.handle.MemberApplyToDoHandler; @@ -22,6 +24,7 @@ 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.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -47,20 +50,24 @@ public class MemberApplySchoolUnionAuditController { private MemberCommonService memberCommonService; @Inject private SysLocalProcessService localProcessService; + @Inject + private MsgApi msgApi; @At("/") @Ok("beetl:/platform/member/apply/schoolUnionAudit/index.html") @RequiresPermissions("member.apply.schoolUnion.audit") - public void index() {} + public void index() { + } @At("/h5") @Ok("beetl:/mobile/member/apply/schoolUnionAudit/index.html") @RequiresPermissions("member.apply.schoolUnion.audit") - public void h5() {} + public void h5() { + } @At @RequiresPermissions("member.apply.schoolUnion.audit") - public Object pageData(MemberApplyPageForm pageForm){ + public Object pageData(MemberApplyPageForm pageForm) { Sql sql = Sqls.create(""" SELECT record.*, @@ -76,8 +83,9 @@ public class MemberApplySchoolUnionAuditController { pageForm.buildSearch(cnd, "record."); if (pageForm.getAudit()) { cnd.and("record.applyStateId", ">", 20); + cnd.and("record.applyStateId", "!=", 70); } else { - cnd.and("record.applyStateId", "=", 20); + cnd.and("record.applyStateId", "in", List.of(20, 70)); } cnd.desc("record.applyDateTime"); sql.setCondition(cnd); @@ -91,7 +99,7 @@ public class MemberApplySchoolUnionAuditController { @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("member.apply.schoolUnion.audit") @SLog(type = "memberApply", tag = "会员入会申请", msg = "校工会审核") - public Object approval(@Param("audit") Audit audit, String id, String unionId){ + public Object approval(@Param("audit") Audit audit, String id, String unionId) { audit.setAuditor(ShiroUtil.getUserId()); audit.setLoginname(ShiroUtil.getPlatformLoginname()); audit.setUsername(ShiroUtil.getPlatformUsername()); @@ -114,39 +122,50 @@ public class MemberApplySchoolUnionAuditController { record.setSchoolUnionAuditId(audit.getId()); dao.updateIgnoreNull(record); + MemberApplyToDoHandler.COMPLETE_SCHOOL_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核完成")); if (audit.getAuditType() == 2) { MemberApplyToDoHandler.CREATE_APPLY_RE_MODIFY_TASK.exec(record, null); // 短信通知 // String content = "%s老师您好，您的入会申请被校工会退回，您可根据退回原因修改后再次提交，如有疑问请及时联系校工会".formatted(record.getUsername()); } else if (audit.getAuditType() == 1) { Sql sql = Sqls.create(""" - SELECT - u.loginname, - u.username - FROM - `sys_user_role` userRole - LEFT JOIN sys_role role ON role.id = userRole.roleId - LEFT JOIN `user` u ON u.id = userRole.userId - WHERE - role.`code` = 'BranchUnionMemberAdmin' and u.unionid = @unionId - group by u.loginname - """).setParam("unionId", unionId); + SELECT + u.loginname, + u.username, + u.unionname + FROM + `sys_user_role` userRole + LEFT JOIN sys_role role ON role.id = userRole.roleId + LEFT JOIN `user` u ON u.id = userRole.userId + WHERE + role.`code` = 'BranchUnionMemberAdmin' and u.unionid = @unionId + group by u.loginname + """).setParam("unionId", unionId); List list = memberCommonService.listMap(sql); - List unionLeaderLoginNames = list.stream().map(v -> v.getString("loginname")).toList(); - MemberApplyToDoHandler.CREATE_UNION_TASK.exec(record, NutMap.NEW().addv("unionLeaderLoginNames", unionLeaderLoginNames)); + if (Lang.isNotEmpty(list)) { + List unionLeaderLoginNames = list.stream().map(v -> v.getString("loginname")).toList(); + MemberApplyToDoHandler.CREATE_UNION_TASK.exec(record, NutMap.NEW().addv("unionLeaderLoginNames", unionLeaderLoginNames)); - // 短信通知 -// for (NutMap map : list) { -// String content = "%s老师您好，%s老师的入会申请校工会已通过，现将工会关系划入本工会，请您点击此消息或前往智慧工会进行接收" -// .formatted(map.getString("username"), record.getUsername()); -// } + // 获取审核人的工会 + NutMap nutMap = list.stream().findFirst().orElse(NutMap.NEW()); + String unionname = nutMap.getString("unionname"); + // 短信通知 + String linkUrl = Globals.AppDomain + "/platform/member/apply/branchUnion/audit/h5"; + for (NutMap map : list) { + String content = "%s，%s老师的入会申请已经通过校工会审核，现将工会关系转入您处，请点击此消息或登录“智慧工会”办理新会员接收手续。" + .formatted(unionname, record.getUsername()); + System.out.println(content); + msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 2, "会员入会审核通知", content, "", linkUrl); + } + } } else { MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核拒绝")); // 短信通知 -// String content = "%s老师您好，您的入会申请被校工会拒绝，如有疑问请及时联系校工会".formatted(record.getUsername()); + String content = "尊敬的%s老师，您的入会申请未被通过，若有疑问请联系校工会，联系电话87692636".formatted(record.getUsername()); + System.out.println(content); + msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "会员入会结果通知", content, "", ""); } - MemberApplyToDoHandler.COMPLETE_SCHOOL_TASK.exec(record, NutMap.NEW().addv("nodeName", "校工会审核完成")); return null; } @@ -156,10 +175,11 @@ public class MemberApplySchoolUnionAuditController { @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("member.apply.schoolUnion.audit") @SLog(type = "memberApply", tag = "会员入会申请", msg = "校工会撤回") - public Object doRevoke(String id){ + public Object doRevoke(String id) { MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); dao.update(MemberApplyRecord.class, Chain.make("applyStateId", 20) - .add("schoolUnionAuditId", null), Cnd.where("id", "=", id)); + .add("schoolUnionAuditId", null).add("allocationUnionId", null) + , Cnd.where("id", "=", id)); dao.clear(Audit.class, Cnd.where("id", "=", record.getSchoolUnionAuditId())); // 待办撤回 localProcessService.revokeTask("MEMBER_APPLY@" + id, "校工会审核"); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index 5b0d4b0..aeff80a 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -37,6 +37,7 @@ import io.v.nutz.zhgh.staffmanage.member.template.MemberTemp; import io.v.nutz.zhgh.staffmanage.member.utils.MemberUtils; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; +import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; @@ -74,7 +75,7 @@ public class MemberChangeManageController { @At("") @Ok("beetl:/platform/member/change/manage/index.html") - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public void index() { } @@ -98,7 +99,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object pageData(@Param(value = "unionId", required = false) String unionId, @Param(value = "unitId", required = false) String unitId, @Param(value = "threeUnitId", required = false) String threeUnitId, @@ -277,7 +278,7 @@ public class MemberChangeManageController { @At @ViReturn @Aop(TransAop.READ_COMMITTED) - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) @SLog(tag = "会员高级管理-会员变更", msg = "分工会/校工会会员管理员提交变更") public Object doSubmitChange(MemberChangeRecord record) { // 检验是否有变更 @@ -341,7 +342,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object sendSms(String userid) { Sys_user user = userService.fetch(userid); /*if (Strings.isNotBlank(user.getMobile())) { @@ -357,7 +358,7 @@ public class MemberChangeManageController { */ @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object allIsWelfareMember(PageForm pageForm, @Param(value = "startDate", required = false) String startDate, @Param(value = "endDate", required = false) String endDate, @@ -429,7 +430,7 @@ public class MemberChangeManageController { */ @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object userUnitMove(String threeUnitId, String unitId, @Param("userId[]") String[] userId) { Sys_unit unit = memberService.dao().fetch(Sys_unit.class, unitId); @@ -466,7 +467,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object userPageData(PageForm pageForm, @Param(value = "unitId", required = false) String unitId, @Param(value = "unionId", required = false) String unionId, @@ -505,7 +506,7 @@ public class MemberChangeManageController { @At @ViReturn @Aop(TransAop.READ_COMMITTED) - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object joinWelfareMember(String[] userIds, String taskId, @Param(value = "threeUnitId", required = false) String threeUnitId, @Param(value = "unitId", required = false) String unitId) { @@ -548,7 +549,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object units() { Cnd cnd = Cnd.NEW(); cnd.and("unitlevel", "=", 2); @@ -560,7 +561,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object batchUpdatePersonType(@Param("users") String data) { List users = Json.fromJsonAsList(Sys_user.class, data); for (Sys_user user : users) { @@ -571,7 +572,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object batchUpdateUserState(@Param("users") String data) { List users = Json.fromJsonAsList(Sys_user.class, data); for (Sys_user user : users) { @@ -583,7 +584,7 @@ public class MemberChangeManageController { @At @Ok("void") - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public void downloadImport(HttpServletResponse response) { try { ViTool.excelResponse(response, "会员导入模版.xlsx"); @@ -613,7 +614,7 @@ public class MemberChangeManageController { @At @Aop(TransAop.READ_COMMITTED) - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) @SLog(type = "会员管理系统", tag = "信息维护-会员高级管理", msg = "导入会员", param = true, result = true) public Object doImport(TempFile file) { @@ -727,7 +728,7 @@ public class MemberChangeManageController { @At @ViReturn - @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}) + @RequiresPermissions(value = {"member.change.mange", "staff.member.change.mange"}, logical = Logical.OR) public Object getAllChangeMemberInfo(String userId){ List mapList = memberService.getAllChangeInfo(userId); if (Lang.isEmpty(mapList)) { diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/handle/MemberApplyToDoHandler.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/handle/MemberApplyToDoHandler.java index 25614dd..68842df 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/handle/MemberApplyToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/handle/MemberApplyToDoHandler.java @@ -196,6 +196,17 @@ public enum MemberApplyToDoHandler { localProcessService.completeProcess("MEMBER_APPLY@" + record.getId()); localProcessService.updateProcessNodeName("MEMBER_APPLY@" + record.getId(), "审核通过"); } + }, + + + /** + * 删除流程 + */ + DELETE_PROCESS() { + @Override + public void exec(MemberApplyRecord record, NutMap extra) { + localProcessService.deleteProcessInstance("MEMBER_APPLY@" + record.getId()); + } }; diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberApplyRecord.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberApplyRecord.java index 50ad5a5..2cc4fe2 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberApplyRecord.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberApplyRecord.java @@ -217,4 +217,14 @@ public class MemberApplyRecord { @Comment("分配的工会关系") @ColDefine(type = ColType.VARCHAR, width = 50) private String allocationUnionId; + + @Column + @Comment("是否自愿加入工会") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isVoluntary; + + @Column + @Comment("签字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sign; } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java index 505ccad..19d1976 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java @@ -162,11 +162,9 @@ public class MemberCommonServiceImpl extends ViServiceImpl implements Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); allowChangeFieldNames.add("member"); allowChangeFieldNames.add("welfareMember"); - allowChangeFieldNames.add("unitid"); Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); dictMap.put("member", "会员状态"); dictMap.put("welfareMember", "福利会员状态"); - dictMap.put("unitid", "单位"); return NutMap.NEW().addv("allowChangeFieldNames", allowChangeFieldNames).addv("dictMap", dictMap); } @@ -357,6 +355,8 @@ public class MemberCommonServiceImpl extends ViServiceImpl implements sysUserService.clearCache(); sysRoleService.clearCache(); + + sysUserService.deleteCacheAndUpdate(info.getId()); } } @@ -414,6 +414,11 @@ public class MemberCommonServiceImpl extends ViServiceImpl implements Object currentValue = this.booleanVerification(newMap.get(fieldName)); Object previousValue = this.booleanVerification(sourceMap.get(fieldName)); + if ("unitId".equals(fieldName)) { + currentValue = (newMap.get(fieldName) == null ? this.booleanVerification(newMap.get("unitid")) : currentValue); + previousValue = (sourceMap.get(fieldName) == null ? this.booleanVerification(sourceMap.get("unitid")) : previousValue); + } + if (!ObjectUtil.equals(currentValue, previousValue)) { String name = fieldsMap.getOrDefault(fieldName, fieldName); if ("unitId".equals(fieldName) || "unitid".equals(fieldName)) { diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java index e786a6f..e48dde9 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java @@ -7,6 +7,7 @@ import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.PageUtil; import io.v.nutz.sys.models.User; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.zhgh.staffmanage.member.constant.MemberChangeType; import io.v.nutz.zhgh.staffmanage.member.service.MemberCommonService; import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeMiddleTable; import io.v.nutz.zhgh.staffmanage.sourcechange.param.pageform.SourceChangePageForm; @@ -145,8 +146,12 @@ public class SourceChangeManageController { @ViReturn @RequiresPermissions("sourcechange.manage") @SLog(tag = "人员变更管理", msg = "手动提交变更") - public Object doSubmit(SourceChangeMiddleTable middleTable) { + public Object doSubmit(@Param("data") SourceChangeMiddleTable middleTable, @Param("isSendMsg") boolean isSendMsg) { sourceChangeManageService.doSourceChange(middleTable); + // 如果是新入职，需要发送邮件 + if (isSendMsg && "新入职".equals(middleTable.getChangeInfosStr())) { + sourceChangeManageService.sendMsgToNewTeacher(middleTable); + } return null; } @@ -155,13 +160,19 @@ public class SourceChangeManageController { @ViReturn @RequiresPermissions("sourcechange.manage") @SLog(tag = "人员变更管理", msg = "批量确认变更") - public Object doBatchChange(@Param("data") String[] ids) { + public Object doBatchChange(@Param("data") String[] ids, @Param("isSendMsg") boolean isSendMsg) { if (Lang.isEmpty(ids)) { return Result.error("未获取到选择数据"); } List list = dao.query(SourceChangeMiddleTable.class, Cnd.where("id", "in", ids)); for (SourceChangeMiddleTable middleTable : list) { sourceChangeManageService.doSourceChange(middleTable); + + // 如果是新入职，需要发送邮件 + if (isSendMsg && "新入职".equals(middleTable.getChangeInfosStr())) { + sourceChangeManageService.sendMsgToNewTeacher(middleTable); + } + } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/SourceChangeManageService.java b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/SourceChangeManageService.java index c915355..207dbce 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/SourceChangeManageService.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/SourceChangeManageService.java @@ -1,6 +1,8 @@ package io.v.nutz.zhgh.staffmanage.sourcechange.service; import io.v.nutz.base.service.BaseService; +import io.v.nutz.sys.models.User; +import io.v.nutz.zhgh.data.model.UserHistory; import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeMiddleTable; import java.util.Date; @@ -24,5 +26,12 @@ public interface SourceChangeManageService extends BaseService changeTypes = new ArrayList<>(); - if (count <= 0) { + + if (isNewTeacher) { changeTypes.add(MemberChangeType.NEW.getType()); - Sys_user sysUser = BeanUtil.copyProperties(middleTable, Sys_user.class); - dao().insert(sysUser); - - user = dao().fetch(User.class, Cnd.where("loginname", "=", middleTable.getLoginname())); - } else { - user = dao().fetch(User.class, Cnd.where("loginname", "=", middleTable.getLoginname())); - + } + if (Lang.isNotEmpty(changeList)) { changeTypes.add(MemberChangeType.BASIC_CHANGE.getType()); + } - if (!ObjectUtil.equals(user.getUserState(), middleTable.getUserState())) { - List list = Arrays.stream(MemberChangeType.values()) - .filter(v -> v.getChangeTypeName().equals(middleTable.getUserState())).toList(); - if (Lang.isNotEmpty(list)) { - changeTypes.add(list.get(0).getType()); - } + if (!ObjectUtil.equals(user.getUserState(), middleTable.getUserState())) { + List list = Arrays.stream(MemberChangeType.values()) + .filter(v -> v.getChangeTypeName().equals(middleTable.getUserState())).toList(); + if (Lang.isNotEmpty(list)) { + changeTypes.add(list.get(0).getType()); } - if (!ObjectUtil.equals(user.getMember(), middleTable.getMember())){ - if (middleTable.getMember() == 1) { - changeTypes.add(MemberChangeType.RESTORE.getType()); - } else { - changeTypes.add(MemberChangeType.WITHDRAWAL.getType()); - } + } + if (!ObjectUtil.equals(user.getMember(), middleTable.getMember())){ + if (middleTable.getMember() == 1) { + changeTypes.add(MemberChangeType.RESTORE.getType()); + } else { + changeTypes.add(MemberChangeType.WITHDRAWAL.getType()); } } - info = dao().fetch(Sys_user.class, Cnd.where("loginname", "=", middleTable.getLoginname())); + Sys_user info = dao().fetch(Sys_user.class, Cnd.where("loginname", "=", middleTable.getLoginname())); String userId = info.getId(); UserHistory history = new UserHistory(); if (Lang.isNotEmpty(changeList)) { @@ -128,7 +125,6 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl { return v.getString("fieldName") + "：" + HtmlUtil.cleanHtmlTag(v.getString("sourceValue")) + "->" + HtmlUtil.cleanHtmlTag(v.getString("newValue")); }).collect(Collectors.joining("；")); + if (isNewTeacher) { + changeInfos = changeInfos + "；新入职"; + } history.setChangeInfosStr(changeInfos); + } else if (Lang.isEmpty(changeList) && isNewTeacher){ + history.setChangeInfosStr("新入职"); } + history.setChangeTypes(changeTypes); dao().insert(history); dao().update(SourceChangeMiddleTable.class, Chain.make("isOperate", 2), Cnd.where("id", "=", middleTable.getId())); + sysUserService.deleteCacheAndUpdate(userId); sysUserService.clearCache(); sysRoleService.clearCache(); + + // 如果有单位异动，发送消息提醒分工会 + if (middleTable.getChangeTypes().contains(MemberChangeType.UNIT_CHANGE.name())){ + sendUnitChangeTeacher(middleTable, history); + } + } + } + + + /** + * 发送入会邀请 + * @param middleTable + */ + @Override + public void sendMsgToNewTeacher(SourceChangeMiddleTable middleTable) { + String context = "尊敬的%s老师，欢迎您加入杭州医学院大家庭，请您点击此条信息或登录“智慧工会”平台申请成为杭医工会会员！" + .formatted(middleTable.getUsername()); + String link = Globals.AppDomain + "/platform/member/apply/submit/h5"; +// msgApi.sendMsg(List.of("DingTalk"), middleTable.getLoginname(), 2, "入会邀请", context, "", link); + } + + + /** + * 如果有单位异动的，找出异动前和异动后的分工会，发送消息提醒两个分工会的会员管理员 + * 如果在同一个分工会下异动，则只发送一条消息 + */ + @Override + public void sendUnitChangeTeacher(SourceChangeMiddleTable middleTable, UserHistory history) { + // 查询出异动前的工会 + Sql beforeUnionSql = Sqls.create("select un.id,un.unionname from sys_union un left join sys_unit unit on unit.unionid where unit.id = @unitId") + .setParam("unitId", history.getUnitid()); + beforeUnionSql.setCallback(Sqls.callback.map()); + dao().execute(beforeUnionSql); + NutMap beforeUnionMap = (NutMap) beforeUnionSql.getResult(); + + + // 查询出异动后的工会 + Sql afterUnionSql = Sqls.create("select un.id,un.unionname from sys_union un left join sys_unit unit on unit.unionid where unit.id = @unitId") + .setParam("unitId", middleTable.getUnitid()); + afterUnionSql.setCallback(Sqls.callback.map()); + dao().execute(afterUnionSql); + NutMap afterUnionMap = (NutMap) afterUnionSql.getResult(); + + // 如果这两个单位归属的是不同的分工会，发送消息提醒两个分工会 + if (beforeUnionMap.getString("id").equals(afterUnionMap.getString("id"))) { + // 找到变更前的分工会会员管理员，发送消息提醒 + Sql beforeUnionAdminSql = Sqls.create(""); + String beforeContent = ""; + + // 找到变更后的分工会会员管理员，发送消息提醒 + String afterContent = ""; } - sendMsgToNewTeacher(date); - } - - - @Override - public void sendMsgToNewTeacher(Date date) { - List historyList = dao().query(UserHistory.class, Cnd.where("changeTypes", "like", "%" + MemberChangeType.NEW.getType() + "%") - .and("DATE_FORMAT(changeTime,'%Y-%m-%d %H:%i')", "=", DateUtil.format(date, "yyyy-MM-dd HH:mm"))); - -// for (UserHistory history : historyList) { -// String context = "%s老师您好，欢迎加入杭医大家庭，诚挚邀请您成为工会会员，如有意愿，请您点击此条消息或前往智慧工会平台申请入会，如无意愿请忽略此消息提醒。".formatted(history.getUsername()); -// String link = Globals.AppDomain + "/platform/member/apply/submit/h5"; -// msgApi.sendMsg(List.of("DingTalk"), history.getLoginname(), 2, "入会邀请", context, "", link); -// } } } diff --git a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html index ecfcfd8..479cdb8 100644 --- a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html @@ -149,11 +149,13 @@ layout("/mobile/platform.html"){ - +
取消 - 退回申请 + 拒绝接收 同意接收
@@ -234,7 +236,7 @@ layout("/mobile/platform.html"){ } let msg = '确定要通过此条申请吗？' if (approvalType === 0) { - msg = '拒绝后不可撤回，确定要拒绝此条申请吗？' + msg = '确定要拒绝接收该教工的工会关系吗？' } else if (approvalType === 2) { msg = '确定要退回此条申请吗？' } diff --git a/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js index e9f2f93..7284753 100644 --- a/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js +++ b/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js @@ -41,8 +41,8 @@ const MEMBER_APPLY_AUDIT_INFO = { {{ viewData.personType }} {{ viewData.preparedBy || '暂无' }} - {{ viewData.member ? '会员' : '非会员' }} - {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + + @@ -67,11 +67,20 @@ const MEMBER_APPLY_AUDIT_INFO = {
-
- 无数据 + + + + + - diff --git a/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html b/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html index a05a8c5..aef8641 100644 --- a/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html @@ -125,7 +125,7 @@ layout("/mobile/platform.html"){ 审核 + style="margin-right: 4px">{{ item.applyStateId === 70 ? '重新审核' : '审核' }} - + - +
取消 - 退回申请 + 拒绝申请 同意申请
diff --git a/src/main/resources/views/mobile/member/apply/submit/index.html b/src/main/resources/views/mobile/member/apply/submit/index.html index 8c6c02b..602ed68 100644 --- a/src/main/resources/views/mobile/member/apply/submit/index.html +++ b/src/main/resources/views/mobile/member/apply/submit/index.html @@ -143,9 +143,9 @@ layout("/mobile/platform.html"){ - - @@ -204,6 +204,22 @@ layout("/mobile/platform.html"){ + + + + + + + +
返 回 @@ -256,6 +272,16 @@ layout("/mobile/platform.html"){ }) }, doSubmit(){ + if (!this.formData.isVoluntary) { + this.$toast.fail('请同意入会意愿') + return + } + + if (!this.formData.sign) { + this.$toast.fail('请签字') + return + } + this.$dialog.confirm({ title: "保存", message: "提交后将进入审核流程，无法再进行编辑，您确定要提交申请吗？", diff --git a/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html b/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html index 99c3f17..5e22af0 100644 --- a/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html +++ b/src/main/resources/views/platform/member/apply/branchUnionAudit/index.html @@ -35,6 +35,12 @@ layout("/layouts/platform.html"){ {{ row.allocationUnionName }} 未分配 +