Skip to content

W
wenHuaBu_adminServer
Commit 9ccf55be by chenjinjing
Options

no message

parent 38739f46
Showing with 66 additions and 29 deletions
src/biz/member/apply.ts
...@@ -151,7 +151,7 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor ...@@ -151,7 +151,7 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
*/ */
export async function applyBatchAdopt({idList}) { export async function applyBatchAdopt({idList}) {
//限制长度 //限制长度
if (idList.length >= 10) throw new BizError(ERRORENUM.批量操作超过个数限制); if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date(); let thisDate = new Date();
const NowMs = thisDate.valueOf(); const NowMs = thisDate.valueOf();
......
src/biz/member/examine.ts
...@@ -33,19 +33,20 @@ import { sendPassNotice } from "../sms"; ...@@ -33,19 +33,20 @@ import { sendPassNotice } from "../sms";
export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) { export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) {
/**查询条件 */ /**查询条件 */
let selectParam:any = { let selectParam:any = {
"$or":[ // "$or":[
{ // {
userRegisterState:{"$lt":USERREGISTERSTATE.驳回修改}, // userRegisterState:{"$lt":USERREGISTERSTATE.驳回修改},
registerFlow:{"$gt":REGISTERFLOW.完成第一步} // registerFlow:{"$gt":REGISTERFLOW.完成第一步}
}, // },
{ // {
userRegisterState:USERREGISTERSTATE.驳回修改, // userRegisterState:USERREGISTERSTATE.驳回修改,
registerFlow:REGISTERFLOW.完成第一步 // registerFlow:REGISTERFLOW.完成第一步
} // }
], // ],
isAdmin:STATE.否 isAdmin:STATE.否
}; //审批列表展示状态除通过外的数据 }; //审批列表展示状态除通过外的数据
if (name) { if (name) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"] = [ selectParam["$and"] = [
{"$or":[ {"$or":[
{unitName:{"$regex":`${name}`}}, {unitName:{"$regex":`${name}`}},
...@@ -53,12 +54,41 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma ...@@ -53,12 +54,41 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
]} ]}
]; ];
} }
if (memberType.length) {
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) selectParam.memberType = MEMBERTYPE.个人会员; let memberTypeLen = Object.keys(MEMBERTYPEECCENUM).filter(key => isNaN(Number(key))).length;
if (memberType.length == 0 || memberType.length == memberTypeLen) {
if (!selectParam["$or"]) selectParam["$or"] = [];
selectParam["$or"].push(
{"$or":[
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
]},
{"$or":[
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
]}
);
} else {
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
// selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"] = [
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
];
}
else {//单位 else {//单位
selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
selectParam["$or"] = [
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
];
} }
} }
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
...@@ -174,7 +204,7 @@ export async function adopt({id, session}) { ...@@ -174,7 +204,7 @@ export async function adopt({id, session}) {
*/ */
export async function batchAdopt({idList, session}) { export async function batchAdopt({idList, session}) {
//限制长度 //限制长度
if (idList.length >= 10) throw new BizError(ERRORENUM.批量操作超过个数限制); if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date(); let thisDate = new Date();
const NowMs = thisDate.valueOf(); const NowMs = thisDate.valueOf();
...@@ -314,19 +344,24 @@ export async function approvalHistoryList({userId}) { ...@@ -314,19 +344,24 @@ export async function approvalHistoryList({userId}) {
*/ */
export async function outPutPendingReviewList({memberType, exportColumns}) { export async function outPutPendingReviewList({memberType, exportColumns}) {
let selectParam:any = { let selectParam:any = {
"$or":[
{
userRegisterState:{"$lt":USERREGISTERSTATE.驳回修改},
registerFlow:{"$gt":REGISTERFLOW.完成第一步}
},
{
userRegisterState:USERREGISTERSTATE.驳回修改,
registerFlow:REGISTERFLOW.完成第一步
}
],
memberType,
isAdmin:STATE.否 isAdmin:STATE.否
}; //审批列表展示状态除通过外的数据 }; //审批列表展示状态除通过外的数据
if (memberType == MEMBERTYPE.个人会员) {
// selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"] = [
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
];
}
else {//单位
selectParam["$or"] = [
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
];
}
let selectTitle = []; let selectTitle = [];
let selectConf = []; let selectConf = [];
exportColumns.forEach( info=> { exportColumns.forEach( info=> {
......
src/biz/member/memberFees.ts
...@@ -267,7 +267,9 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai ...@@ -267,7 +267,9 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel}; if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "name"]; const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "name"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10); let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
// let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
let dataCount = await findCount(TABLEENUM.用户表, selectParam); let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = []; let dataList = [];
......
src/biz/member/order.ts
...@@ -626,7 +626,7 @@ export async function billStateHistory({id}) { ...@@ -626,7 +626,7 @@ export async function billStateHistory({id}) {
*/ */
export async function billStateBatchAdopt({idList}) { export async function billStateBatchAdopt({idList}) {
//限制长度 //限制长度
if (idList.length >= 10) throw new BizError(ERRORENUM.批量操作超过个数限制); if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date(); let thisDate = new Date();
const NowMs = thisDate.valueOf(); const NowMs = thisDate.valueOf();
......
src/main.ts
...@@ -19,7 +19,7 @@ async function lanuch() { ...@@ -19,7 +19,7 @@ async function lanuch() {
httpServer.createServer(systemConfig.port); httpServer.createServer(systemConfig.port);
console.log('This indicates that the server is started successfully.'); console.log('This indicates that the server is started successfully.');
await initSMS(); await initSMS();
await initAdmin(); // await initAdmin();
await initSystemTask(); await initSystemTask();
await initActivity(); await initActivity();
// await initSaveUnsubmitted(); // await initSaveUnsubmitted();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment