会员bug整改

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", "重新修改申请"));
             }
             // 待分工会审核

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

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<String> ids;
+}

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

src/main/resources/views/platform/member/change/branchUnionAudit/index.html

@@ -16,11 +16,17 @@ layout("/layouts/platform.html"){
                                 <el-radio-button label="true">已审核</el-radio-button>
                                 <el-radio-button label="false">未审核</el-radio-button>
                             </el-radio-group>
+                            <el-button size="small" type="primary" @click="openAllAudit">批量审核</el-button>
                         </template>
                     </table-tool>
-                    <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
+                    <el-table :data="tableData"  @selection-change="handleSelectionChange" row-key="id" :reserve-selection="true" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
+                        <el-table-column
+                                type="selection"
+                                width="55">
+                        </el-table-column>
                         <el-table-column :index="indexMethod" align="center" header-align="center"
                                          label="序号" type="index" width="80px"></el-table-column>
+
                         <el-table-column :label="column.label"
                                          :prop="column.prop"
                                          :sortable="column.sortable"
@@ -127,6 +133,7 @@ layout("/layouts/platform.html"){
                 showApprovalForm: false,
 
                 changeTypeData: [],
+                multipleSelection:[]
             }
         },
         components: {
@@ -135,6 +142,9 @@ layout("/layouts/platform.html"){
             'member-change-audit-info': MEMBER_CHANGE_AUDIT_INFO
         },
         methods: {
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
             openView(row){
                 this.$refs.guava.view()
                 this.$nextTick(() => {
@@ -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() {

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()

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

src/main/resources/views/platform/member/change/record/index.html

@@ -167,7 +167,7 @@ layout("/layouts/platform.html"){
                                      label="操作"
                                      width="100px" fixed="right">
                         <template scope="{row}">
-                            <el-button size="mini" type="primary" @click="openView(row.userId)">查看</el-button>
+                            <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
                         </template>
                     </el-table-column>
                 </el-table>