c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

会员

Browse Source
This commit is contained in:
Paidax
2024-12-31 16:31:42 +08:00
parent fdc7a6c53b
commit d6d077186f
6 changed files with 407 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/data/constant/UserChangeType.java
+1 -1
View File
@@ -22,7 +22,7 @@ public enum UserChangeType {
RESIGN(3, "离校"),
DIE(4, "去世"),
RETIREMENT(5, "离退休"),
// EXPELLED(6, "开除"),
EXPELLED(6, "开除"),
RESTORE(7, "入会"),
WITHDRAWAL(8, "退会"),
// NONE(9, "不变"),
src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java
+10 -1
View File
@@ -221,7 +221,7 @@ public class MemberCommonController {
}
String userState = StrUtil.blankToDefault(changeRecord.getChangeUserState(), "");
if (!userState.equals(sysUserMap.getString("userState", ""))) {
if (StrUtil.isNotBlank(userState) && !userState.equals(sysUserMap.getString("userState", ""))) {
compareData.add(NutMap.NEW()
.addv("columnName", "在职状态")
.addv("newValue", userState)
@@ -229,6 +229,15 @@ public class MemberCommonController {
);
}
String personType = StrUtil.blankToDefault(changeRecord.getChangePersonType(), "");
if (StrUtil.isNotBlank(personType) && !personType.equals(sysUserMap.getString("personType", ""))) {
compareData.add(NutMap.NEW()
.addv("columnName", "人员类型")
.addv("newValue", personType)
.addv("oldValue", sysUserMap.getString("personType"))
);
}
//在职,退休,离职可能会发生会员和福利会员的变化
if(changeRecord.getUpdateMember()!=null && changeRecord.getUpdateMember()){
//说明要改变会员状态
src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java
+7
View File
@@ -311,7 +311,11 @@ public class MemberChangeManageController {
memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
MemberChangeAuditHandle.SCHOOL.next(memberChangeRecord, audit);
} else {
if (ShiroUtil.hasAnyRoles("gh01, H04")) {
memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
} else if (ShiroUtil.hasRole("ghxzzz")){
memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION_GROUP.getCode());
}
memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
MemberChangeAuditHandle.UNION.next(memberChangeRecord, audit);
}
@@ -546,6 +550,9 @@ public class MemberChangeManageController {
public Object units() {
Cnd cnd = Cnd.NEW();
cnd.and("unitlevel", "=", 2);
if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) {
cnd.and("id", "!=", "DZJF000");
}
return sysUnitService.dao().query("unit_union", cnd);
}
src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
+2 -1
View File
@@ -181,9 +181,10 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
wpus.receiveAddress,
wpus.welfareId,
wpus.selectUserId,
wl.welfareUnitId as unionId
IF(staff.unionRelationUnionId is not null, staff.unionRelationUnionId, wl.welfareUnitId) AS unionId
FROM
`welfare_project_user_selection` wpus
LEFT JOIN special_staff staff ON staff.userId = wpus.selectUserId
LEFT JOIN welfare_list wl on wl.userId = wpus.selectUserId AND wpus.welfareId = wl.projectId
$condition
""");
src/main/resources/static/components/member/MemChangeApply.vue
+33 -18
View File
@@ -39,14 +39,18 @@
<el-form-item prop="type" label="变更类型">
<!-- <dict-select v-model="formData.type" style="width: 100%" clearable placeholder="变更类型"-->
<!-- code="MemberChangeType" @change="typeChange"></dict-select>-->
<el-select v-model="formData.type" style="width: 100%" clearable placeholder="变更类型" @change="typeChange">
<el-option v-for="item in userChangeTypeList" :label="item.name" :value="item.code" :key="item.id"></el-option>
<el-select v-model="formData.type" style="width: 100%" clearable placeholder="变更类型"
@change="typeChange">
<el-option v-for="item in userChangeTypeList" :label="item.name" :value="item.code"
:key="item.id"></el-option>
</el-select>
</el-form-item>
<!--异动-->
<div v-if="formData.type==='1'">
<el-form-item prop="type" label="新&ensp;单&ensp;位">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="type" label="新单位">
<el-select v-model="formData.currentUnitId" style="width: 100%" filterable clearable
@change="unitChange"
placeholder="请选择单位">
@@ -57,10 +61,14 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-form-item prop="type" label="新&ensp;工&ensp;会">
<el-input :value="formData.currentUnionName" disabled placeholder=""></el-input>
<el-col :span="12">
<el-form-item prop="type" label="新工会">
<el-input :value="formData.currentUnionName" readonly placeholder="选择单位后自动填充"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="isThreeUnit">
<el-col :span="12">
@@ -80,7 +88,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="工会小组">
<el-input :value="formData.currentUnionGroupName" disabled></el-input>
<el-input :value="formData.currentUnionGroupName" readonly placeholder="选择科室后自动填充"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -144,7 +152,8 @@
</el-col>
<el-col :span="12">
<el-form-item prop="updateUserState" label="是否改变在职状态" style="width: 100%">
<dict-select v-model="formData.changeUserState" style="width: 100%" clearable placeholder="是否改变在职状态"
<dict-select v-model="formData.changeUserState" style="width: 100%" clearable
placeholder="是否改变在职状态"
code="userState"></dict-select>
</el-form-item>
</el-col>
@@ -190,7 +199,8 @@
<el-input v-model="formData.oldEducation" readonly type="text"></el-input>
</el-form-item>
<el-form-item prop="education" label="新的学历" style="width: 100%">
<dict-select v-model="formData.changeEducation" style="width: 100%" clearable placeholder="请选择新的学历"
<dict-select v-model="formData.changeEducation" style="width: 100%" clearable
placeholder="请选择新的学历"
code="Education"></dict-select>
</el-form-item>
</div>
@@ -253,7 +263,7 @@ module.exports = {
threeUnits: [],
isThreeUnit: false,
userChangeTypeList:[],
userChangeTypeList: [],
}
},
watch: {
@@ -263,11 +273,15 @@ module.exports = {
},
methods: {
typeChange(val) {
console.log(val)
this.$set(this.formData, "updateWelfareMember", ['2','7'].includes(this.formData.type))
if (val == '1') {
this.formData.updateWelfareMember = null
this.formData.updateMember = null
} else {
this.$set(this.formData, "updateWelfareMember", ['2', '7'].includes(this.formData.type))
this.$set(this.formData, "updateWelfareMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
this.$set(this.formData, "updateMember", ['2'].includes(this.formData.type))
this.$set(this.formData, "updateMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
}
},
async doSubmit() {
this.$refs["form"].validate((valid) => {
@@ -290,7 +304,6 @@ module.exports = {
// this.formData.currentUnionId = ''
// this.formData.currentUnionName = ''
// }
this.$set(this.formData, 'currentThreeUnitId', null)
this.$set(this.formData, 'currentUnionGroupName', null)
this.threeUnits = []
@@ -298,6 +311,7 @@ module.exports = {
this.getThreeUnits(v)
}
const unit = this.unitOptions.find(x => x.id === v)
this.isThreeUnit = unit.unionname.includes("机关");
if (unit) {
this.$set(this.formData, 'currentUnionId', unit.unionid)
this.$set(this.formData, 'currentUnionName', unit.unionname)
@@ -348,9 +362,9 @@ module.exports = {
personType: resp.data.personType,
auditTime: moment().format('YYYY-MM-DD'),
notes: null,
oldIdCard:resp.data.idcard,
oldMobile:resp.data.mobile,
oldEducation:resp.data.education
oldIdCard: resp.data.idcard,
oldMobile: resp.data.mobile,
oldEducation: resp.data.education
}
this.disabled = false
} else {
@@ -368,15 +382,16 @@ module.exports = {
this.unitOptions = resp.data
}
},
async getUserChangeType(){
async getUserChangeType() {
const resp = await $.get('/platform/member/common/getUserChangType')
if (resp.code === 0){
if (resp.code === 0) {
this.userChangeTypeList = resp.data
}
},
},
async created() {
this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
// this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
// this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
await this.getUnits()
await this.flush()
await this.getUserChangeType()
src/main/resources/views/platform/member/change/Manage.html
+5 -5
View File
@@ -159,7 +159,7 @@ layout("/layouts/platform.html"){
</template>
<template #func>
<el-radio-group v-model="pageForm.myUnionGroupUser" @change="doSearch" class="mr5"
v-if="isThreeUnit" size="small">
v-if="isThreeUnit === true" size="small">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button :label="1">本小组会员</el-radio-button>
<el-radio-button :label="0">非本小组会员</el-radio-button>
@@ -304,7 +304,8 @@ layout("/layouts/platform.html"){
查看
</el-dropdown-item>
<el-dropdown-item
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionMemberAdmin')||@shiro.hasRole('H03')||@shiro.hasRole('H04')}"
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('ghxzzz')
||@shiro.hasRole('SchoolUnionMemberAdmin')||@shiro.hasRole('H03')||@shiro.hasRole('H04')}"
:disabled="!(row.apply||row.reApply)"
:command="{type:'change',data:row}">
变更
@@ -911,9 +912,8 @@ layout("/layouts/platform.html"){
},
async created() {
// this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
this.isThreeUnit = '${@shiro.getPrincipalProperty("union").getUnionname()}'.includes('机关') && "${@shiro.hasRole('ghxzzz')}"
console.log(this.isThreeUnit)
if (this.isThreeUnit) {
if (${@shiro.hasRole('ghxzzz')}) {
this.isThreeUnit = true
this.pageForm.myUnionGroupUser = 1
this.tableColumns.forEach(v => {
if (["threeUnitName", "unionGroupName"].includes(v.prop)) {