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

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { BANXUELEIXING, 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";
@@ -314,33 +314,21 @@ export async function approvalHistoryList({userId}) {
  */
 export async function outPutPendingReviewList({memberType, exportColumns}) {
     let selectParam:any = {
-        "$or":[],
+        "$or":[
+            {
+                userRegisterState:{"$lt":USERREGISTERSTATE.驳回修改}, 
+                registerFlow:{"$gt":REGISTERFLOW.完成第一步}
+            },
+            {
+                userRegisterState:USERREGISTERSTATE.驳回修改, 
+                registerFlow:REGISTERFLOW.完成第一步
+            }
+        ],
+        memberType,
         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", "unitName"];                               
-        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.完成第三步 },
-        ];
-       
-    }
     exportColumns.forEach( info=> {
         if (info.key == "省市区") {
             selectTitle.push("省", "市", "区");
@@ -367,6 +355,8 @@ export async function outPutPendingReviewList({memberType, exportColumns}) {
                 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 == "unitMemberType") value = changeEnumValue(UNITMEMBERTYPE, value);
+                else if (key == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, 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);

src/biz/member/member.ts

@@ -441,6 +441,7 @@ export async function outPutIndividualMembers({exportColumns}) {
                 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 == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, value);
                 else if (key == "profCategory") value = changeEnumValue(PROFCATEGORY, value);
                 else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
                 else if (key == "lableId") {
@@ -505,6 +506,7 @@ export async function outPutUnitMembers({exportColumns}) {
                 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 == "unitMemberType") value = changeEnumValue(UNITMEMBERTYPE, value);
                 else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
                 else if (key == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, value);
                 else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);

src/config/outPutConfig.ts

@@ -26,7 +26,7 @@ export enum UNITAUDITINGCOLUMNS {
     学生总人数 = "yuanXiaoXueShengZongRenShu",
 
     单位信用代码 = "uscc",
-    // 单位信息类型 = "",
+    单位信息类型 = "unitMemberType",
     办公负责人 = "yuanXiaoBanGongFuZeRen",
     教职工总人数 = "yuanXiaoJiaoZhiGongZongRenShu",