commit
This commit is contained in:
Paidax
+2
-2
@@ -180,10 +180,10 @@ public class MemberApplyBranchUnionAuditController {
|
||||
sysUserService.deleteCacheAndUpdate(user.getId());
|
||||
|
||||
MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null);
|
||||
String content = "尊敬的%s老师，您已正式成为杭医工会会员，会员关系在%s，欢迎您的加入！"
|
||||
String content = "亲爱的%s老师：欢迎您加入杭州医学院大家庭！您的工会关系在%s，愿您在这个充满活力的集体中，感受“家”的温馨，汇聚“爱”的力量。学校工会将始终陪伴在您身边，竭诚为您服务，期待与您携手同行，共同书写属于“杭医人”的精彩！"
|
||||
.formatted(user.getUsername(), union.getUnionname());
|
||||
System.out.println(content);
|
||||
msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "入会结果通知", content, "", "");
|
||||
msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "", content, "", "");
|
||||
} else {
|
||||
// 杭州医学院，分工会拒绝接收，还要去创建校工会的审核任务
|
||||
MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会拒绝接收"));
|
||||
|
||||
+18
@@ -4,6 +4,7 @@ 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;
|
||||
import io.v.nutz.sys.models.Sys_user_role;
|
||||
import io.v.nutz.sys.models.User;
|
||||
import io.v.nutz.web.commons.base.Globals;
|
||||
@@ -21,6 +22,7 @@ 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.lang.Lang;
|
||||
import org.nutz.lang.util.NutMap;
|
||||
import org.nutz.mvc.annotation.At;
|
||||
import org.nutz.mvc.annotation.Ok;
|
||||
@@ -150,7 +152,23 @@ public class MemberApplyController {
|
||||
@At
|
||||
@ViReturn
|
||||
@Aop(TransAop.READ_COMMITTED)
|
||||
@RequiresPermissions("member.apply.submit")
|
||||
public Object validateApply(){
|
||||
return dao.count(MemberApplyRecord.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("applyStateId", "in", List.of(10, 20, 30, 50, 60)));
|
||||
}
|
||||
|
||||
|
||||
@At
|
||||
@ViReturn
|
||||
@RequiresPermissions("member.apply.submit")
|
||||
public Object getSelfUserInfo(){
|
||||
Sys_user user = (Sys_user) ShiroUtil.getPrincipal();
|
||||
if (Lang.isNotEmpty(user)) {
|
||||
Sys_user sourceUser = dao.fetch(Sys_user.class, ShiroUtil.getUserId());
|
||||
user.setMember(sourceUser.getMember());
|
||||
}
|
||||
return user;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+6
-4
@@ -322,8 +322,9 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl<SourceChangeM
|
||||
List<NutMap> beforeMapList = commonService.listMap(beforeUnionAdminSql);
|
||||
if (Lang.isNotEmpty(beforeMapList)) {
|
||||
for (NutMap map : beforeMapList) {
|
||||
String beforeContent = "尊敬的%s老师，根据学校最新人员信息调整，%s老师的工会关系已从您处调整至%s。特此告知，烦请知悉。祝您生活愉快！"
|
||||
.formatted(map.getString("username"), middleTable.getUsername(), afterUnionMap.getString("unionname"));
|
||||
// XX分工会，根据学校最新人员调整，XX老师的工会关系已调整至XX工会。烦请知悉。
|
||||
String beforeContent = "%s，根据学校最新人员调整，%s老师的工会关系已调整至%s。烦请知悉。"
|
||||
.formatted(beforeUnionMap.getString("unionname"), middleTable.getUsername(), afterUnionMap.getString("unionname"));
|
||||
|
||||
System.out.println(beforeContent);
|
||||
msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 1, "工会关系转出通知", beforeContent, "", "");
|
||||
@@ -348,8 +349,9 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl<SourceChangeM
|
||||
|
||||
if (Lang.isNotEmpty(afterMapList)) {
|
||||
for (NutMap map : afterMapList) {
|
||||
String afterContent = "尊敬的%s老师，根据学校最新人员信息调整，%s老师的工会关系已从%s调整至您处。特此告知，烦请知悉。祝您生活愉快！"
|
||||
.formatted(map.getString("username"), middleTable.getUsername(), beforeUnionMap.getString("unionname"));
|
||||
// ✘✘分工会，根据学校最新人员调整，XX老师的工会关系已从XX工会调整至您处。请予接洽。
|
||||
String afterContent = "%s，根据学校最新人员调整，%s老师的工会关系已从%s调整至您处。请予接洽。"
|
||||
.formatted(afterUnionMap.getString("unionname"), middleTable.getUsername(), beforeUnionMap.getString("unionname"));
|
||||
|
||||
System.out.println(afterContent);
|
||||
msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 1, "工会关系转入通知", afterContent, "", "");
|
||||
|
||||
@@ -209,9 +209,16 @@ layout("/mobile/platform.html"){
|
||||
<template #label>
|
||||
<van-checkbox style="font-size: 17px" icon-size="24px"
|
||||
v-model="formData.isVoluntary" shape="square">
|
||||
<span :style="'color:' + (formData.isVoluntary ? '#1989fa' : '#F56C6C') ">
|
||||
我自愿申请加入杭州医学院工会，严格遵守工会章程，认真执行工会决议，委托学校按规定代为扣缴工会会员会费，并积极参与工会组织的各项活动，主动融入 “杭医健康幸福家” 建设，以实际行动为学校工会事业发展贡献力量。
|
||||
</span>
|
||||
<div style="text-indent: 2.1rem">
|
||||
<span :style="'color:' + (formData.isVoluntary ? '#1989fa' : '#F56C6C') ">
|
||||
我自愿申请加入杭州医学院工会，并委托学校按规定代为扣缴工会会员会费。
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-indent: 2.1rem">
|
||||
<span :style="'color:' + (formData.isVoluntary ? '#1989fa' : '#F56C6C') ">
|
||||
我将严格遵守工会章程 ，认真执行工会决议，积极参与工会活动，主动融入“杭医健康幸福家”建设，为营造温暖、和谐、奋进的校园氛围贡献力量，以实际行动助力学校各项事业发展。
|
||||
</span>
|
||||
</div>
|
||||
</van-checkbox>
|
||||
</template>
|
||||
</van-cell>
|
||||
@@ -345,8 +352,18 @@ layout("/mobile/platform.html"){
|
||||
})
|
||||
}
|
||||
},
|
||||
init(){
|
||||
this.user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
async init(){
|
||||
const resp = await $.post('/platform/member/apply/submit/getSelfUserInfo')
|
||||
if (resp.code === 0) {
|
||||
if (!resp.data) {
|
||||
this.user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
} else {
|
||||
this.user = resp.data
|
||||
}
|
||||
} else {
|
||||
this.user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
}
|
||||
|
||||
if (this.user.member) {
|
||||
vant.Dialog.alert({
|
||||
title: '提示',
|
||||
|
||||
@@ -178,9 +178,16 @@ layout("/layouts/platform.html"){
|
||||
size="medium"
|
||||
style="width: 95%; color: #F56C6C; display: flex; align-items: center;"
|
||||
v-model="formData.isVoluntary">
|
||||
<span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
|
||||
我自愿申请加入杭州医学院工会，严格遵守工会章程，认真执行工会决议，委托学校按规定代为扣缴工会会员会费，并积极参与工会组织的各项活动，主动融入 “杭医健康幸福家” 建设，以实际行动为学校工会事业发展贡献力量。
|
||||
</span>
|
||||
<div>
|
||||
<span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
|
||||
我自愿申请加入杭州医学院工会，并委托学校按规定代为扣缴工会会员会费。
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
|
||||
我将严格遵守工会章程 ，认真执行工会决议，积极参与工会活动，主动融入“杭医健康幸福家”建设，为营造温暖、和谐、奋进的校园氛围贡献力量，以实际行动助力学校各项事业发展。
|
||||
</span>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
@@ -351,8 +358,18 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
}
|
||||
},
|
||||
init(){
|
||||
const user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
async init(){
|
||||
let user
|
||||
const resp = await $.post('/platform/member/apply/submit/getSelfUserInfo')
|
||||
if (resp.code === 0) {
|
||||
if (!resp.data) {
|
||||
user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
} else {
|
||||
user = resp.data
|
||||
}
|
||||
} else {
|
||||
user = JSON.parse(window.sessionStorage.getItem('user'))
|
||||
}
|
||||
this.member = user.member
|
||||
if (this.id) {
|
||||
$.post("/platform/member/apply/submit/findApplyById", { id: this.id }).then((res) => {
|
||||
|
||||
Reference in New Issue
Block a user