no message

src/biz/member/examine.ts

@@ -28,7 +28,14 @@ import { getCityNameByCode } from "../../config/cityConfig";
  */
 export async function pendingReviewList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
     /**查询条件 */
-    let selectParam:any = {userRegisterState:{"$ne": USERREGISTERSTATE.通过}, registerFlow:REGISTERFLOW.完成第二步,isAdmin:STATE.否}; //审批列表展示状态除通过外的数据
+    let selectParam:any = {
+        "$or":[
+            { userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
+            { userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
+            { userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 },
+        ],
+        isAdmin:STATE.否
+    }; //审批列表展示状态除通过外的数据
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
     if (memberType) selectParam.memberType = memberType;
@@ -36,7 +43,7 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
     if (shi) selectParam.shi = shi;
     if (qu) selectParam.qu = qu;
 
-    const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "workUnit"];
+    const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
@@ -46,7 +53,6 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
         /**处理枚举值 */
         if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
         else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
-        if (item.memberType == MEMBERTYPE.个人会员) item.unitName = item.workUnit;
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         item.sheng = getCityNameByCode(item.sheng);
         item.shi = getCityNameByCode(item.shi);
@@ -96,7 +102,6 @@ export async function adopt({id, session}) {
     let subType = userInfo.unitMemberType;
     if (userInfo.memberType == MEMBERTYPE.个人会员) {
         addInfo.individualMemberType = INDIVIDUALMEMBERTYPE.个人会员;
-        unitName = userInfo.name;
         subType = userInfo.individualMemberType;
     }
 

src/biz/member/member.ts

@@ -184,7 +184,7 @@ export async function individualMemberList({name, documentId, phone, individualM
     selectParam.memberType = MEMBERTYPE.个人会员;
     selectParam.userRegisterState = USERREGISTERSTATE.通过;
 
-    let selectConf = ["userId", "memberState", "workUnit", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu"];
+    let selectConf = ["userId", "memberState", "unitName", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
@@ -195,7 +195,6 @@ export async function individualMemberList({name, documentId, phone, individualM
         if (!item.memberLevel) item.memberLevel = "未选择";
         else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
 
-        item.unitName = info.workUnit;
         item.shi = getCityNameByCode(item.shi);
         item.sheng = getCityNameByCode(item.sheng);
         item.qu = getCityNameByCode(item.qu);

src/data/models/model.ts

@@ -376,7 +376,7 @@ const ModelArray = [
             education:'Number',//学历
             photoUrl:'String',//证件照图片地址 蓝底证件照
             /**第二步流程表单（个人）【专业信息】 */
-            workUnit:'String',//工作单位
+            workUnit:'String',//工作单位  弃用
             duties:'String',//职务【注册用】
             workTitle:'String',//职称
             studyResume:'String',//学习简历

src/dataScript.ts

+/**
+ * 数据脚本
+ */
+
+import moment = require("moment");
+import { addManyData } from "./data/add";
+import { TABLEENUM } from "./data/models/model";
+import { generateUserId } from "./tools/system";
+
+/**
+ * 注册账号
+ */
+export async function test1() {
+
+    let i = parseInt(`${moment().hour()}${moment().minute()}${moment().second()}`);
+    let maxi = i + 20;
+    let dataList = [];
+    for (i; i <= maxi; i++) {
+        dataList.push({
+            "adminLv" : [],
+            "registerFlow" : 2,
+            "isAdmin" : 0,
+            "userRegisterState" : 1,
+            "memberState" : 1,
+            "memberLevel" : 1,
+            "isGracePeriod" : 0,
+            "cardUrl" : [ 
+                "http://192.168.0.105:40012/whb/files/12/vue2024-03-22_16-11-873169.png"
+            ],
+            "auxiliaryMaterial" : [],
+            "userId" : generateUserId(),
+            "memberType" : 1,
+            "askForTime" : 1711095028440.0,
+            "loginId" : `赵今麦${i}`,
+            "mail" : "18120935727@163.com",
+            "pwd" : "123456",
+            "phone" : `1812093${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}`,
+            "__v" : 0,
+            "academicCERTUrl" : "http://192.168.0.105:40012/whb/files/12/vue2024-03-22_16-11-356620.png",
+            "addres" : "才能实现但是",
+            "birth" : 1711036800000.0,
+            "documentId" : "340822199901012333",
+            "documentType" : 1,
+            "duties" : "吃的蔬菜生产",
+            "education" : 2,
+            "name" : `赵今麦${i}`,
+            "nation" : 1,
+            "otherEMP" : "村上春树",
+            "otherPROF" : "村上春树",
+            "photoUrl" : "http://192.168.0.105:40012/whb/files/12/vue2024-03-22_16-11-624049.png",
+            "profAchievement" : "村上春树",
+            "profCategory" : 1,
+            "professionalCERTUrl" : "http://192.168.0.105:40012/whb/files/12/vue2024-03-22_16-11-603763.png",
+            "qu" : "130524",
+            "sex" : 2,
+            "sheng" : "130000",
+            "shi" : "130500",
+            "studyResume" : "菜市场",
+            "unitName" : "村上春树",
+            "workResume" : "村上春树",
+            "workTitle" : "村上春树"
+        })
+    }
+    await addManyData(TABLEENUM.用户表, dataList);
+    console.log("初始化成功");
+}
\ No newline at end of file

src/main.ts

 import { initAdmin } from "./biz/member/rightsMgmt";
 import { initConfig, systemConfig} from "./config/serverConfig";
 import { initDataBaseModel } from "./data/db/db";
+import { test1 } from "./dataScript";
 import { httpServer } from "./net/http_server";
 
 async function lanuch() {
@@ -14,6 +15,7 @@ async function lanuch() {
     // await smsTask();
     console.log('This indicates that the server is started successfully.');
     // await initAdmin();
+    // test1();
 }
 
 lanuch();

src/routers/member/router.ts

@@ -63,9 +63,6 @@ export const Config = {
                         professionalCERTUrl:{type:'String', desc:'个人工作证明扫描件'},
                         auxiliaryMaterial:{type:'[String]', desc:'论文发表等证明工作成果或成绩的材料'},
                     }
-                },
-                {
-                    key:"userId", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:registerBiz.memberRegister2
@@ -129,9 +126,6 @@ export const Config = {
                 },
                 {
                     key:"keyanForm", type:"[Object]", desc:"单位所获得科研成果表单"
-                },
-                {
-                    key:"userId", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:registerBiz.unitMemberRegister2
@@ -142,9 +136,6 @@ export const Config = {
             param:[
                 {
                     key:"application", type:"String", desc:"入会申请表"
-                },
-                {
-                    key:"userId", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:registerBiz.unitMemberRegister3
@@ -161,24 +152,28 @@ export const Config = {
         },
         {
             apiName:"获取当前会员注册流程",
+            notMiddleware:true,
             subUrl:'/memberdb/registerflowtype',
             param:[],
             bindBiz:registerBiz.registerFlowType
         },
         {
             apiName:"单位会员【流程二】回显",
+            notMiddleware:true,
             subUrl:'/memberdb/unitmemberecho2',
             param:[],
             bindBiz:registerBiz.unitMemberEcho2
         },
         {
             apiName:"单位会员【流程三】回显",
+            notMiddleware:true,
             subUrl:'/memberdb/unitmemberecho3',
             param:[],
             bindBiz:registerBiz.unitMemberEcho3
         },
         {
             apiName:"个人会员【流程二】回显",
+            notMiddleware:true,
             subUrl:'/memberdb/individualmemberdetails',
             param:[],
             bindBiz:registerBiz.individualMemberDetails

src/tools/system.ts

@@ -105,7 +105,7 @@ export function getEdition(year, month) {
     const startYear = 1993;
     const Num = ((year-startYear)+1)/5;
     let jie = Math.ceil(Num);
-    let ci = ((Num*100) - ((jie - 1)*100))/10;
+    let ci = Math.ceil(((Num*100) - ((jie - 1)*100))/10);
     if (month <= 6)  ci = ci - 1;
 
     return `第${jie}届,第${ci}次`;