no message

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, 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";
@@ -197,3 +197,63 @@ export async function approvalHistoryList({userId}) {
 
     return {dataList};
 }
+
+
+
+export async function outPutPendingReviewList({memberType}) {
+    let selectParam:any = {
+        "$or":[],
+        isAdmin:STATE.否
+    }; //审批列表展示状态除通过外的数据
+    let selectTitle = [];
+    let selectConf = [];
+    if (memberType == MEMBERTYPE.个人会员) {
+        selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码", "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别"];
+        selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId", "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"];                                    
+        selectParam["$or"] = [
+            { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
+            { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
+            { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
+        ];
+    } else {
+        selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码", "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"];
+        selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];                                    
+        selectParam["$or"] = [
+            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
+            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
+            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 } 
+        ];
+       
+    }
+   
+    let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
+    let timeChnageList = ["joinTime", "birth"];
+    let addList = ["sheng", "shi", "qu"];
+    
+    let dataList = [selectTitle];
+    dbList.forEach(info => {
+        let subList = [];
+        for (let i = 0; i < selectConf.length; i++) {
+            let key = selectConf[i];
+            let value = info[key] || "";
+            if (value) {
+                if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
+                else if (key == "isInput" || key == "isGracePeriod") value = value == true ? "是" : "否";
+                else if (key == "memberState") value = changeEnumValue(MEMBERSTATE, value);
+                else if (key == "certificateType") value = changeEnumValue(CERTIFICATETYPE, value);
+                else if (key == "individualMemberType") value = changeEnumValue(INDIVIDUALMEMBERTYPE, value);
+                else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
+                else if (key == "sex") value = changeEnumValue(SEX, value);
+                else if (key == "documentType") value = changeEnumValue(DOCUMENTTYPE, value);
+                else if (key == "nation") value = changeEnumValue(NATION, value);
+                else if (key == "education") value = changeEnumValue(EDUCATION, value);
+                else if (key == "profCategory") value = changeEnumValue(PROFCATEGORY, value);
+                else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
+            }
+            subList.push(value);
+        }
+        dataList.push(subList);
+    });
+
+    return {dataList};
+}

src/biz/member/member.ts

@@ -2,12 +2,12 @@
  * 会员管理逻辑
  */
 
-import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV, ADMINTYPE, SEX } from "../../config/enum";
+import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV, ADMINTYPE, SEX, CERTIFICATETYPE, INDIVIDUALMEMBERTYPE, EDUCATION } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
 import { updateOneData } from "../../data/update";
-import { generateSystemId, getEdition, successResult } from "../../tools/system";
+import { changeArticleName, generateSystemId, getEdition, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
@@ -323,4 +323,115 @@ export async function systemBase({userId}) {
     }
 
     return {dataInfo}
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出个人会员数据
+ * @param param0 
+ */
+export async function outPutIndividualMembers({}) {
+    let selectParam = {
+        isAdmin:STATE.否, 
+        memberType: MEMBERTYPE.个人会员, 
+        userRegisterState: USERREGISTERSTATE.通过,
+        isFirstPay:true
+    };
+    let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码",
+     "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别"];
+    let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId",
+     "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"];                                    
+    let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
+    let timeChnageList = ["joinTime", "birth"];
+    let addList = ["sheng", "shi", "qu"];
+
+    let dataList = [selectTitle];
+    dbList.forEach(info => {
+        let subList = [];
+        for (let i = 0; i < selectConf.length; i++) {
+            let key = selectConf[i];
+            let value = info[key] || "";
+            if (value) {
+                if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
+                else if (key == "isInput" || key == "isGracePeriod") value = value == true ? "是" : "否";
+                else if (key == "memberState") value = changeEnumValue(MEMBERSTATE, value);
+                else if (key == "certificateType") value = changeEnumValue(CERTIFICATETYPE, value);
+                else if (key == "individualMemberType") value = changeEnumValue(INDIVIDUALMEMBERTYPE, value);
+                else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
+                else if (key == "sex") value = changeEnumValue(SEX, value);
+                else if (key == "documentType") value = changeEnumValue(DOCUMENTTYPE, value);
+                else if (key == "nation") value = changeEnumValue(NATION, value);
+                else if (key == "education") value = changeEnumValue(EDUCATION, value);
+                else if (key == "profCategory") value = changeEnumValue(PROFCATEGORY, value);
+                else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
+            }
+            subList.push(value);
+        }
+        dataList.push(subList);
+    });
+
+    return {dataList};
+}
+
+/**
+ * 导出单位会员数据
+ * @param param0 
+ * @returns 
+ */
+export async function outPutUnitMembers({}) {
+    let selectParam = {
+        isAdmin:STATE.否, 
+        memberType: MEMBERTYPE.单位会员, 
+        userRegisterState: USERREGISTERSTATE.通过,
+        isFirstPay:true
+    };
+    let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码", 
+    "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"];
+    let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", 
+    "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];                                    
+    let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
+
+    let timeChnageList = ["joinTime"];
+
+    let dataList = [selectTitle];
+    dbList.forEach(info => {
+        let subList = [];
+        for (let i = 0; i < selectConf.length; i++) {
+            let key = selectConf[i];
+            let value = info[key] || "";
+            if (value) {
+                if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
+                else if (key == "isInput" || key == "isGracePeriod") value = value == true ? "是" : "否";
+                else if (key == "memberState") value = changeEnumValue(MEMBERSTATE, value);
+                else if (key == "certificateType") value = changeEnumValue(CERTIFICATETYPE, value);
+                else if (key == "individualMemberType") value = changeEnumValue(INDIVIDUALMEMBERTYPE, value);
+                else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
+            }
+            subList.push(value);
+        }
+        dataList.push(subList);
+    });
+
+    return {dataList}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/routers/router.ts

@@ -14,6 +14,7 @@ import * as memberRouter from "./member/router";
 import * as costRouter from "./cost/router";
 import * as officalWebsiteRouter from "./officalWebsite/router";
 import * as orderRouter from "./order/router";
+import * as outPutRouter from "./outPut/routers";
 import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
@@ -29,6 +30,7 @@ export async function setRouter(httpServer){
         // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
         // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
+        await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
     }
     analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, true);//网站编辑
     analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件
@@ -36,6 +38,7 @@ export async function setRouter(httpServer){
     analysisRouter(httpServer, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter, false);//官网路由
     analysisRouter(httpServer, orderRouter.Config, orderRouter.FirstRouter, true);//会费相关
     analysisRouter(httpServer, costRouter.Config, costRouter.FirstRouter, true);//支付
+    analysisRouter(httpServer, outPutRouter.Config, outPutRouter.FirstRouter, true);//导出路由
 }
 
 

src/tools/reqResult.ts

@@ -2,9 +2,9 @@ import { systemConfig } from "../config/serverConfig";
 import { postForm } from "../util/request";
 const Cookie = [
     'sidebar_collapsed=false',
-    'cookie_token=6a28392e71084032f8076d24e32fc15e6dc8532d0717f8183529ce0d9a7e0df5',
+    'cookie_token=65a71d64884f80995195eba723ce3db2236a8398644a2fe56280f0334a4bd1a5',
     '_gitlab_session=a8de022ccd772cd40a82f6e9cc11b061',
-    'PHPSESSID=62mlp67e45ijp450hs9f5tt9h5',
+    'PHPSESSID=97g5f9olpu5r6m7q93nbaclgk2',
     'think_language=zh-CN'
 ];
 let headers = {