Skip to content

W
wenHuaBu_adminServer
Commit 6fc39d2f by lixinming
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer 

# Conflicts:
#	src/biz/member/examine.ts
parents 771007bd 735c3729
Showing with 148 additions and 18 deletions
src/biz/member/examine.ts
...@@ -51,11 +51,10 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma ...@@ -51,11 +51,10 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
if (examineState == 1) { if (examineState == 1) {
if (!selectParam["$and"]) selectParam["$and"] = []; if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push({"$or":[ selectParam["$and"].push({"$or":[
{userRegisterState:USERREGISTERSTATE.重新提交},
{userRegisterState:USERREGISTERSTATE.待审核} {userRegisterState:USERREGISTERSTATE.待审核}
]}); ]});
} else { } else {
selectParam.userRegisterState = USERREGISTERSTATE.驳回修改 selectParam.userRegisterState = USERREGISTERSTATE.重新提交
} }
} }
...@@ -141,7 +140,7 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma ...@@ -141,7 +140,7 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
/** /**
* 入会审批-提交资料列表 * 入会审批-提交资料列表
*/ */
export async function submitDocument({loginId, phone, mail, pageNumber, pageSize}) { export async function submitDocument({name, memberType, documentId, phone, mail, sheng, shi, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize); if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */ /**查询条件 */
let selectParam:any = { let selectParam:any = {
...@@ -149,11 +148,58 @@ export async function submitDocument({loginId, phone, mail, pageNumber, pageSize ...@@ -149,11 +148,58 @@ export async function submitDocument({loginId, phone, mail, pageNumber, pageSize
// logonState:LOGONSTATE.完成第一步未提交, // logonState:LOGONSTATE.完成第一步未提交,
registerFlow:REGISTERFLOW.完成第一步 registerFlow:REGISTERFLOW.完成第一步
}; };
if (loginId) selectParam.loginId = {"$regex":loginId}; if (name) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"] = [
{"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]}
];
}
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 (!selectParam["$or"]) selectParam["$or"] = [];
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
// selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"].push(
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
);
}
if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位
// selectParam.unitMemberType = {"$in":memberType};
selectParam["$or"].push(
{ 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 (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "loginId", "memberType", "phone", "mail", "logonState", "askForTime", "firstStep"]; const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "individualMemberType", "unitMemberType", "memberType", "mail"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize); let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam); let dataCount = await findCount(TABLEENUM.用户表, selectParam);
...@@ -161,8 +207,23 @@ export async function submitDocument({loginId, phone, mail, pageNumber, pageSize ...@@ -161,8 +207,23 @@ export async function submitDocument({loginId, phone, mail, pageNumber, pageSize
dbList.forEach(info => { dbList.forEach(info => {
let item:any = extractData(info, SelectFiles); let item:any = extractData(info, SelectFiles);
/**处理枚举值 */ /**处理枚举值 */
if (item.logonState) changeEnumValue(LOGONSTATE, item.logonState); if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType); else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
// item.sheng = getCityNameByCode(item.sheng);
// item.shi = getCityNameByCode(item.shi);
// item.qu = getCityNameByCode(item.qu);
if(item.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
}
if(item.unitMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
}
//这一行代码是兼容老用户没有 individualMemberType
if (info.memberType == MEMBERTYPE.个人会员) {
item.memberType = "个人会员";
}
item.askForTime = item.askForTime || item.firstStep; item.askForTime = item.askForTime || item.firstStep;
...@@ -211,31 +272,92 @@ export async function delRejectJoin({id}) { ...@@ -211,31 +272,92 @@ export async function delRejectJoin({id}) {
/** /**
* 入会审批-驳回列表 * 入会审批-驳回列表
*/ */
export async function rejectList({loginId, phone, mail, pageNumber, pageSize}) { export async function rejectList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize); if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */ /**查询条件 */
let selectParam:any = { let selectParam:any = {
isAdmin:STATE.否, isAdmin:STATE.否,
userRegisterState : USERREGISTERSTATE.驳回修改 userRegisterState : USERREGISTERSTATE.驳回修改
}; };
if (loginId) selectParam.loginId = {"$regex":loginId}; if (name) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"] = [
{"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]}
];
}
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 (!selectParam["$or"]) selectParam["$or"] = [];
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
// selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"].push(
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
);
}
if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位
// selectParam.unitMemberType = {"$in":memberType};
selectParam["$or"].push(
{ 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 (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "loginId", "memberType", "phone", "mail", "logonState", "name", "unitName", "sheng", "shi", "askForTime"]; const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "individualMemberType", "unitMemberType", "memberType", "mail"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize); let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam); let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = []; let dataList = [];
dbList.forEach(info => { for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
let item:any = extractData(info, SelectFiles); let item:any = extractData(info, SelectFiles);
let historyList = await findOnce(TABLEENUM.审批历史表, {userId:info.userId, operationBehavipr:USERREGISTERSTATE.驳回修改});
item.operationTime = moment(historyList.operationTime).format("YYYY-MM-DD");
/**处理枚举值 */ /**处理枚举值 */
if (item.logonState) changeEnumValue(LOGONSTATE, item.logonState); if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType); else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
item.sheng = getCityNameByCode(item.sheng); item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
item.shi = getCityNameByCode(item.shi); if(item.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
}
if(item.unitMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
}
//这一行代码是兼容老用户没有 individualMemberType
if (info.memberType == MEMBERTYPE.个人会员) {
item.memberType = "个人会员";
}
dataList.push(item); dataList.push(item);
}); }
return {dataList, dataCount}; return {dataList, dataCount};
} }
......
src/routers/member/router.ts
...@@ -547,9 +547,13 @@ export const Config = { ...@@ -547,9 +547,13 @@ export const Config = {
apiName:"提交资料列表", apiName:"提交资料列表",
subUrl:'/examine/submitdocument', subUrl:'/examine/submitdocument',
param:[ param:[
{key:"loginId", type:"String", desc:"用户名", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true}, {key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true}, {key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}, {key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"}, {key:"pageSize", type:"Number", desc:"一页显示多少数据"},
], ],
...@@ -627,9 +631,13 @@ export const Config = { ...@@ -627,9 +631,13 @@ export const Config = {
apiName:"驳回列表", apiName:"驳回列表",
subUrl:'/examine/rejectlist', subUrl:'/examine/rejectlist',
param:[ param:[
{key:"loginId", type:"String", desc:"用户名", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true}, {key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true}, {key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}, {key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"}, {key:"pageSize", type:"Number", desc:"一页显示多少数据"},
], ],
......
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