From 51aed947459009ef0aceedfb7217172ff831f59f Mon Sep 17 00:00:00 2001 From: Paidax Date: Tue, 30 Sep 2025 15:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=20+=20=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...MemberApplyBranchUnionApprovalController.java | 16 ---------------- .../staffmanage/member/apply/submit/index.html | 2 ++ .../staffmanage/member/change/common/info.js | 2 +- .../member/change/common/memberAllChangeInfo.js | 2 +- .../member/change/common/memberChange.js | 12 ++++++------ 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java index c27ef162..24b993b4 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java @@ -1,45 +1,29 @@ package com.budwk.app.zhgh.staffmanage.member.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; import com.budwk.app.bpm.service.BpmService; import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.base.Globals; import com.budwk.app.web.controllers.open.commons.service.CommonService; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; -import com.budwk.app.zhgh.staffmanage.member.vo.MemberCommonVo; import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; -import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; -import javax.validation.Valid; -import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 会员入会申请分工会审核 diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 00ddb345..0bf0f85d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -393,6 +393,7 @@ layout("/layouts/platform.html"){ campus, userState, personType, + preparedBy, idCard, mobile, email, @@ -414,6 +415,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "campus", campus) this.$set(this.formData, "userState", userState) this.$set(this.formData, "personType", personType) + this.$set(this.formData, "preparedBy", preparedBy) this.$set(this.formData, "unitName", unit ? unit.name : unitName) this.$set(this.formData, "unitId", unit ? unit.id : unitId) this.$set(this.formData, "unionName", union ? union.name : unionName) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js index d3bf9f4a..442bc013 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js @@ -31,7 +31,7 @@ const INFO = { {{ viewData.userState }} {{ viewData.personType }} - {{ viewData.schoolTime }} + {{ viewData.preparedBy }}