diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java index b74385f..0137b55 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java @@ -109,7 +109,7 @@ public class MemberChangeApplyController { record.setChangeOrigin(MemberChangeOrigin.PERSONAL.name()); - if (List.of(10030, 10060).contains(record.getApplyStateId())) { + if (record.getApplyStateId() != null && List.of(10030, 10060).contains(record.getApplyStateId())) { MemberChangeToDoHandler.COMPLETE_APPLY_RE_MODIFY_TASK.exec(record, NutMap.NEW().addv("nodeName", "重新修改申请")); } // 待分工会审核 diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java index 45aedad..a02e855 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeBranchUnionAuditController.java @@ -11,6 +11,8 @@ import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.staffmanage.member.handle.MemberChangeToDoHandler; import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord; import io.v.nutz.zhgh.staffmanage.member.param.pageForm.MemberChangePageForm; + +import io.v.nutz.zhgh.staffmanage.member.param.vo.MemberChangeBranchUnionAuditVo; import io.v.nutz.zhgh.staffmanage.member.service.MemberCommonService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; @@ -122,6 +124,31 @@ public class MemberChangeBranchUnionAuditController { return null; } + @At + @ViReturn + @Aop(TransAop.READ_COMMITTED) + @RequiresPermissions("member.change.branchUnion.audit") + @SLog(type = "memberChange", tag = "会员变更", msg = "分工会批量审核") + public Object allApproval(MemberChangeBranchUnionAuditVo memberChangeBranchUnionAuditVo){ + Audit audit = memberChangeBranchUnionAuditVo.getAudit(); + audit.setAuditor(ShiroUtil.getUserId()); + audit.setLoginname(ShiroUtil.getPlatformLoginname()); + audit.setUsername(ShiroUtil.getPlatformUsername()); + audit.setAuditTime(DateUtil.date()); + audit.setAuditOpinion("通过"); + audit = dao.insert(audit); + for (String id : memberChangeBranchUnionAuditVo.getIds()) { + MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id); + // 通过 + record.setApplyStateId(10050); + record.setBranchUnionAuditId(audit.getId()); + dao.updateIgnoreNull(record); + MemberChangeToDoHandler.COMPLETE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会审核完成")); + MemberChangeToDoHandler.CREATE_SCHOOL_TASK.exec(record, null); + } + return null; + } + @At @ViReturn diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/param/vo/MemberChangeBranchUnionAuditVo.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/param/vo/MemberChangeBranchUnionAuditVo.java new file mode 100644 index 0000000..aa4ab9e --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/param/vo/MemberChangeBranchUnionAuditVo.java @@ -0,0 +1,16 @@ +package io.v.nutz.zhgh.staffmanage.member.param.vo; + +import io.v.nutz.base.model.Audit; +import lombok.Data; + +import java.util.List; + +/** + * @author hpf + */ +@Data +public class MemberChangeBranchUnionAuditVo { + private Audit audit; + + private List ids; +} diff --git a/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js index 442d85f..0528422 100644 --- a/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js +++ b/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js @@ -94,6 +94,7 @@ const MEMBER_APPLY_AUDIT_INFO = { }, methods: { async onOpen(id){ + this.activeName="basicInfo" const resp = await $.post('/platform/member/apply/mine/findMemberApplyRecord', {id}) if (resp.code === 0) { this.viewData = resp.data diff --git a/src/main/resources/views/platform/member/change/branchUnionAudit/index.html b/src/main/resources/views/platform/member/change/branchUnionAudit/index.html index 46db198..1b11b77 100644 --- a/src/main/resources/views/platform/member/change/branchUnionAudit/index.html +++ b/src/main/resources/views/platform/member/change/branchUnionAudit/index.html @@ -16,11 +16,17 @@ layout("/layouts/platform.html"){ 已审核 未审核 + 批量审核 - + + + + { @@ -222,6 +232,33 @@ layout("/layouts/platform.html"){ .join(",") } return null + }, + openAllAudit(){ + if (this.multipleSelection.length === 0){ + this.$message.warning('请选择一条记录') + return + } + this.$confirm('确定要批量审批吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async () => { + const user = JSON.parse(window.sessionStorage.getItem('user')) + this.formData.username = user.username + this.formData.auditTime = moment().format('YYYY-MM-DD HH:mm:ss') + this.formData.auditType = 1 + const ids = this.multipleSelection.map((v) => v.id) + const resp = await $.post('/platform/member/change/branchUnion/audit/allApproval', { + audit: JSON.stringify(this.formData), + ids: JSON.stringify(ids) + }) + if (resp.code === 0) { + this.$message.success(resp.msg) + this.pageData() + } else { + this.$message.error(resp.msg) + } + }) } }, async created() { diff --git a/src/main/resources/views/platform/member/change/common/memberChange.js b/src/main/resources/views/platform/member/change/common/memberChange.js index e1d1f23..185e279 100644 --- a/src/main/resources/views/platform/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/member/change/common/memberChange.js @@ -411,6 +411,7 @@ const MEMBER_CHANGE = { this.user = JSON.parse(window.sessionStorage.getItem('user')) } this.getFormDataValue(this.id) + console.log(this.formData) this.allowChangeFields = await getDictOptions("ALLOW_CHANGE_FIELDS") if (this.$auth.hasRoleOr('sysadmin, SchoolUnionMemberAdmin, SchoolUnionAdmin')) { this.units = await getUnits() diff --git a/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js b/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js index c975027..7cbbee8 100644 --- a/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js +++ b/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js @@ -114,6 +114,7 @@ const MEMBER_CHANGE_AUDIT_INFO = { }, methods: { async onOpen(id){ + this.activeName="basicInfo" const resp = await $.post('/platform/member/change/mine/findMemberChangeRecord', {id}) if (resp.code === 0) { this.viewData = resp.data diff --git a/src/main/resources/views/platform/member/change/record/index.html b/src/main/resources/views/platform/member/change/record/index.html index 91ab285..76b8515 100644 --- a/src/main/resources/views/platform/member/change/record/index.html +++ b/src/main/resources/views/platform/member/change/record/index.html @@ -167,7 +167,7 @@ layout("/layouts/platform.html"){ label="操作" width="100px" fixed="right">