会员 + 工会小组

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;
 
 /**
  * 会员入会申请分工会审核

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)

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js

@@ -31,7 +31,7 @@ const INFO = {
 					    
 					    <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
 					    <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
-					    <el-descriptions-item label="进校时间">{{ viewData.schoolTime }}</el-descriptions-item>
+					    <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
 					    
 					    <template v-if="viewData.userState == '退休'">
 						    <el-descriptions-item label="退休日期">{{ viewData.retireDate ?

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberAllChangeInfo.js

@@ -25,7 +25,7 @@ const MEMBER_ALL_CHANGE_INFO = {
 
                     <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
                     <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
-                    <el-descriptions-item label="进校时间">{{ viewData.schoolTime }}</el-descriptions-item>
+                    <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
                     
                     <template v-if="viewData.userState == '退休'">
                         <el-descriptions-item label="退休日期">{{ viewData.retireDate ? $moment(viewData.retireDate).format("YYYY-MM-DD") : '暂无' }}</el-descriptions-item>

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js

@@ -139,18 +139,18 @@ const MEMBER_CHANGE = {
 					                     :disabled="allowFields('userState')" style="width: 100%"></dict-select>
 				        </el-form-item>
 			        </el-descriptions-item>
-			        <el-descriptions-item label="编制类别">
-				        <el-form-item prop="preparedBy">
-					        <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
-					                     :disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
-				        </el-form-item>
-			        </el-descriptions-item>
 			        <el-descriptions-item label="教职工类别">
 				        <el-form-item prop="personType">
 					        <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
 					                     :disabled="allowFields('personType')" style="width: 100%"></dict-select>
 				        </el-form-item>
 			        </el-descriptions-item>
+			        <el-descriptions-item label="编制类别">
+				        <el-form-item prop="preparedBy">
+					        <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
+					                     :disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
+				        </el-form-item>
+			        </el-descriptions-item>
 			        
 			        <template v-if="formData.userState == '退休'">
 				        <el-descriptions-item label="退休日期">