no message

src/biz/member/apply.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MSGTYPE, STATE, UNITMEMBERTYPE } from "../../config/enum";
+import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MSGTYPE, SEX, STATE, UNITMEMBERTYPE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort, findToSortToPage } from "../../data/select";
 import { extractData } from "../../util/piecemeal";
@@ -28,7 +28,8 @@ import { sendMessage } from "../sms";
  * @param memberLevel 申请变更会员
  * @returns 
  */
-export async function applyList({name, joinStartTime, joinEndTime, memberCategory, beforeChange, memberLevel, pageNumber, pageSize}) {
+// export async function applyList({name, joinStartTime, joinEndTime, memberCategory, beforeChange, memberLevel, pageNumber, pageSize}) {
+export async function applyList({name, memberType, pageNumber, pageSize}) {
     let selectParam:any = {
         isBlackUser:STATE.否,
         changeApplyType:{"$gt":CHANGEAPPLYTYPE.注册信息补充完成} //返回除了补充注册信息之外的所有状态数据
@@ -41,34 +42,37 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
             ]
         }]
     }
-    if (joinStartTime) {
-        selectParam["joinTime"] = {"$gt":joinStartTime};
-    }
-    if (joinEndTime) {
-        if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
-        selectParam["joinTime"]["$lt"] = joinEndTime;
-    }
-    if (memberCategory) {
-        if ( memberCategory >= 9) selectParam.unitMemberType = memberCategory;
-        else selectParam.individualMemberType = memberCategory;
+    let memberTypeLen = Object.keys(MEMBERTYPEECCENUM).filter(key => isNaN(Number(key))).length;
+    /**通过获取的数量判断前端参数是否 全选 或者 全不选*/
+    if (memberType.length != 0 && memberType.length != memberTypeLen) {
+        if (!selectParam["$or"]) selectParam["$or"] = [];
+        if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
+            selectParam["$or"].push(
+                { memberType:MEMBERTYPE.个人会员 }
+            )
+        }
+        if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位
+            selectParam["$or"].push(
+                { unitMemberType:{"$in":memberType} }
+            )
+        }
     }
-    if (memberLevel && memberLevel.length) selectParam.applyMemberLevel = {"$in":memberLevel};
-    if (beforeChange && beforeChange.length) selectParam.beforeChange = {"$in":beforeChange};
 
     let selectConf = ["userId", "applyId", "changeApplyType", "unitName", "name", "beforeChange", "applyMemberLevel", "applyStr", "applyApplicationTime", 
-    "applyReviewTime", "individualMemberType", "unitMemberType", "memberType", "memberLevel"];
+    "contactPerson", "sex", "duties", "phone", "applyReviewTime", "individualMemberType", "unitMemberType", "memberType", "memberLevel"];
     let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {applyApplicationTime:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
 
     let itemConf = ["userId", "applyId", "changeApplyType", "unitName", "name", "beforeChange", "applyMemberLevel", "applyStr", "applyApplicationTime", 
-    "applyReviewTime", "memberType"];
+    "applyReviewTime", "memberType", "contactPerson", "sex", "duties", "phone"];
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
         let item:any = extractData(info, itemConf);
         item.changeApplyType = changeEnumValue(CHANGEAPPLYTYPE, item.changeApplyType);
         item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
+        item.sex = changeEnumValue(SEX, item.sex);
 
         let applyMemberLevel = "";
         if (!item.applyMemberLevel) applyMemberLevel = "未选择";
@@ -89,6 +93,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
 
         item.applyApplicationTime = moment(item.applyApplicationTime).format("YYYY-MM-DD");
         item.applyReviewTime = item.applyReviewTime ? moment(item.applyReviewTime).format("YYYY-MM-DD") : '-';
+        item.duties = item.duties || "";
+        item.phone = item.phone || "";
 
         dataList.push(item);
     }

src/routers/apply/router.ts

@@ -14,11 +14,13 @@ export const Config = {
             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:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
+                // {key:"unitMemberType", type:"Number", 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:"当前页"},
                 {key:"pageSize", type:"Number", desc:"一页大小"}
             ],