理事变更申请

src/biz/member/authority.ts

@@ -46,6 +46,7 @@ export async function getAuthority({unitName, memberLevel, memberCategory, pageN
             item.memberCategory = changeEnumValue(UNITMEMBERTYPE, info.unitMemberType);//会员类别/级别
         }
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        // if(!item.beforeChange && item.changeApplyType != CHANGEAPPLYTYPE.通过) topInfo.memberLevel = oldInfo.beforeChange;
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);//会员等级、职务
 
         dataList.push(item);

src/biz/member/msgActivity.ts

@@ -234,7 +234,8 @@ export async function noticeMessage({userId}) {
 
     let dataList = [];
     const SelectFiles = ["msgId", "msgTitle", "effectiveTime", "msgContent", "isPop"];
-    let msgInfo = await find(TABLEENUM.消息通知表, selectParam, SelectFiles);
+    let msgInfo = await findToSort(TABLEENUM.消息通知表, selectParam, {createTime:-1}, SelectFiles);
+    // let msgInfo = await find(TABLEENUM.消息通知表, selectParam, SelectFiles);
     // if (!msgInfo || !msgInfo.msgId) throw new BizError(ERRORENUM.目标数据不存在);
     if (msgInfo) {
         msgInfo.forEach( info => {

src/config/enum.ts

@@ -699,6 +699,8 @@ export enum CLIENTMSGLABLE {
     单位会员 = "单位会员",
     理事 = "理事会员",
     常务理事 = "常务理事会员",
+    驳回申请 = "驳回理事申请",
+    通过申请 = "通过理事申请",
 }
 
 
@@ -758,3 +760,39 @@ export enum ORDEREXAMINE {
     用户提交 = 1,
     退回
 }
+
+
+/**
+ * 会员等级 会员职务【变更理事】
+ */
+export enum MEMBERLEVELCHANGE {
+    申请理事 = MEMBERLEVEL.理事会员,
+    申请常务理事 = MEMBERLEVEL.常务理事会员,
+}
+
+
+/**
+ * 变更审批状态
+ */
+export enum CHANGEAPPLYTYPE {
+    注册信息待补充 = 1,
+    注册信息补充完成,
+    通过,
+    待审批,
+    驳回修改,
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/config/errorEnum.ts

@@ -64,7 +64,9 @@ export enum ERRORENUM {
     当前变更申请未发生变化,
     不可重复提交,
     订单非退回状态,
-    该类型退款无需确认
+    该类型退款无需确认,
+    注册信息待补充,
+    超出可申请范围
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -445,7 +445,14 @@ const ModelArray = [
             /**注册第二步保存未提交 */
             saveUnsubmitted:{type:'Number', default:STATE.否},//是否提交注册完成 0：否， 1：是  STATE
             firstStep:'Number',//第一步完成时间
-            memberLevelChange:'Number',//会员等级、职务 枚举 MEMBERLEVEL 【变更申请职位】
+            /**变更理事 */
+            applyMemberLevel:'Number',//申请变更的职位
+            beforeChange:'Number',//会员等级、职务 枚举 MEMBERLEVEL 【变更申请前的职位】
+            applyStr:'String',//变更理事申请理由
+            changeApplyType:'Number',//变更审批状态
+            applyApplicationTime:'Number',//变更理事申请时间
+            applyReviewTime:'Number',//变更理事审核时间
+            rejectRemarks:'String',//变更理事驳回理由
         }
     },
     {

src/routers/apply/router.ts

+/**
+ * 变更审批
+ */
+import * as applyBiz from "../../biz/member/apply";
+
+
+export const FirstName = '变更审批';
+export const FirstRouter = '/manage/apply';
+export const Config = {
+    "变更审批管理":[
+        {
+            apiName:"变更审批列表",
+            subUrl:'/applydb/applylist',
+            param:[ // name, joinStartTime, joinEndTime, beforeChange, memberLevel, pageNumber
+                {key:"name", type:"String", desc:"单位/个人名称", isNull:true},
+                {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
+                {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
+                {key:"beforeChange", type:"[Number]", desc:"变更前会员等级职务", isNull:true},
+                {key:"memberLevel", type:"[Number]", desc:"变更后会员等级职务", isNull:true},
+                {key:"memberCategory", type:"Number", desc:"会员类别", isNull:true},
+                {key:"pageNumber", type:"Number", desc:"当前页"}
+            ],
+            bindBiz:applyBiz.applyList
+        },
+        {
+            apiName:"变更审批通过",
+            subUrl:'/applydb/applyadopt',
+            param:[
+                {key:"id", type:"String", desc:"用户id"},
+            ],
+            bindBiz:applyBiz.applyAdopt
+        },
+        {
+            apiName:"批量通过",
+            subUrl:'/applydb/applybatchadopt',
+            param:[
+                {key:"idList", type:"[String]", desc:"批量通过的用户列表"},
+            ],
+            bindBiz:applyBiz.applyBatchAdopt
+        },
+        {
+            apiName:"驳回",
+            subUrl:'/applydb/applyreject',
+            param:[
+                {key:"id", type:"String", desc:"用户id"},
+                {key:"remarks", type:"String", desc:"驳回理由"}
+            ],
+            bindBiz:applyBiz.applyReject
+        },
+        {
+            apiName:"数据导出",
+            subUrl:'/applydb/outputapply',
+            param:[
+            ],
+            bindBiz:applyBiz.outPutApply
+        },
+    ]
+}
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
\ No newline at end of file

src/routers/public/router.ts

@@ -308,6 +308,13 @@ export const Config = {
             param:[],
             defaultParam:enumConfig.ISRECEIVE,
             bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"变更理事",
+            subUrl:'/memberlevelchange', 
+            param:[],
+            defaultParam:enumConfig.MEMBERLEVELCHANGE,
+            bindBiz:publicBiz.setEnumInterface
         }
     ],
     

src/routers/router.ts

@@ -18,6 +18,7 @@ import * as outPutRouter from "./outPut/routers";
 import * as labelRouter from "./lable/router";
 import * as blacklistRouter from "./blackList/router";
 import * as msgActivityRouter from "./msgActivity/router";
+import * as applyRouter from "./apply/router";
 import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
@@ -28,16 +29,17 @@ export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
         // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
-        // await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
-        // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
+        await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
+        await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
         // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
-        await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
+        // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
         // await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
         // await initDoc(labelRouter.FirstName, labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", blacklistRouter.Config, blacklistRouter.FirstRouter);//黑名单路由
         // await initDoc("2.0", msgActivityRouter.Config, msgActivityRouter.FirstRouter);//消息活动通知路由
+        await initDoc(applyRouter.FirstName, applyRouter.Config, applyRouter.FirstRouter);//变更审批路由
     }
     analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, true);//网站编辑
     analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件
@@ -49,6 +51,7 @@ export async function setRouter(httpServer){
     analysisRouter(httpServer, labelRouter.Config, labelRouter.FirstRouter, true);//标签相关
     analysisRouter(httpServer, blacklistRouter.Config, blacklistRouter.FirstRouter, true);//黑名单相关
     analysisRouter(httpServer, msgActivityRouter.Config, msgActivityRouter.FirstRouter, true);//消息活动通知
+    analysisRouter(httpServer, applyRouter.Config, applyRouter.FirstRouter, true);//消息活动通知
 }