no message

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -18,17 +18,21 @@ import { getCityNameByCode } from "../../config/cityConfig";
 
 /**
  * 待审核列表 success
- * @param unitName 单位名称
- * @param joinTime 入会时间
- * @param memberType 会员类型 MEMBERTYPE
+ * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
+ * @param memberType 会员类别 unitMemberType、individualMemberType
+ * 会员类别、职务、级别改成多选
+ * 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
+ * @param documentId 身份证
+ * @param phone 登录手机号
+ * @param mail 单位/个人邮箱
  * @param sheng 省
  * @param shi 市
- * @param qu 区
  * @param pageNumber 当前页 
  */
-export async function pendingReviewList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
+export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) {
     /**查询条件 */
     let selectParam:any = {
+        "$and":[{
             "$or":[
                 { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
                 { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
@@ -36,17 +40,30 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
                 { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
                 { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
                 { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
-        ],
+            ]
+        }],
         isAdmin:STATE.否
     }; //审批列表展示状态除通过外的数据
-    if (unitName) selectParam.unitName = unitName;
-    if (joinTime) selectParam.joinTime = joinTime;
-    if (memberType) selectParam.memberType = memberType;
+    if (name) selectParam["$and"].push({
+        "$or":[
+            {unitName:name},
+            {name},
+        ]
+    });
+    if (memberType) {
+        if (memberType < UNITMEMBERTYPE.院校) {
+            selectParam.individualMemberType = {"$in":memberType};
+        } else {
+            selectParam.unitMemberType = {"$in":memberType};
+        }
+    }
+    if (documentId) selectParam.documentId = documentId;
+    if (phone) selectParam.phone = phone;
+    if (mail) selectParam.mail = mail;
     if (sheng) selectParam.sheng = sheng;
     if (shi) selectParam.shi = shi;
-    if (qu) selectParam.qu = qu;
 
-    const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "memberType", "mail"];
+    const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "mail"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
@@ -60,7 +77,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
         item.sheng = getCityNameByCode(item.sheng);
         item.shi = getCityNameByCode(item.shi);
         item.qu = getCityNameByCode(item.qu);
-        item.memberType = changeEnumValue(MEMBERTYPE, info.memberType);
+        if(item.individualMemberType) item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
+        if(item.unitMemberType) item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
 
         dataList.push(item);
     });
@@ -271,8 +289,12 @@ export async function approvalHistoryList({userId}) {
 }
 
 
-
-export async function outPutPendingReviewList({memberType}) {
+/**
+ * 导出
+ * @param param0 
+ * @returns 
+ */
+export async function outPutPendingReviewList({memberType, exportColumns}) {
     let selectParam:any = {