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

src/biz/member/homePage.ts

@@ -4,7 +4,7 @@
  */
 
 import moment = require("moment");
-import { BANXUELEIXING, DOCUMENTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, MEMBERLEVEL, MEMBERTYPE, NATION, ORDERSTATE, PROFCATEGORY, SEX, STATE, UNITMEMBERTYPE } from "../../config/enum";
+import { BANXUELEIXING, DOCUMENTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, MEMBERLEVEL, MEMBERTYPE, NATION, ORDERSTATE, PROFCATEGORY, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { deleteManyData } from "../../data/delete";
@@ -37,8 +37,8 @@ export async function getMemberData({userId}) {
         "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", 
         "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
     } else {
-        baseSelectFiles = ["name", "sex", "documentType", "documentId", "sheng", "shi", "qu", "nation", "birth", "addres"];
-        majorSelectFiles = ["workUnit", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"]; 
+        baseSelectFiles = ["name", "sex", "documentType", "documentId", "sheng", "shi", "qu", "nation", "birth", "addres", "education", "phone", "mail", "photoUrl", "uscc", "unitName"];
+        majorSelectFiles = ["workUnit", "unitName", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"]; 
     }
 
     /**返回指定配置字段 */
@@ -50,6 +50,8 @@ export async function getMemberData({userId}) {
     topInfo.integral = 0;
     if(topInfo.joinTime) topInfo.joinTime = moment(topInfo.joinTime).format("YYYY-MM-DD");
     if(topInfo.lifespanEndTime) topInfo.lifespanEndTime = moment(topInfo.lifespanEndTime).format("YYYY-MM-DD");
+    if(topInfo.userRegisterState == USERREGISTERSTATE.通过) topInfo.userRegisterState = "已入会";
+    else topInfo.userRegisterState = "未入会";
     // if(topInfo.memberLevel) topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
     // if(baseInfo.sex) baseInfo.sex = changeEnumValue(SEX, baseInfo.sex);
     // if(baseInfo.documentType) baseInfo.documentType = changeEnumValue(DOCUMENTTYPE, baseInfo.documentType);

src/biz/member/member.ts

@@ -69,11 +69,11 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
  * @returns {顶部数据, 基本信息, 单位信息, 单位所获得科研成果}
  */
 
-const UnitBasicConfig = ["userId", "unitName", "addres", "uscc", "legalPerson", "legalPersonPhone", "contactPerson", "contactPersonDuties", "sheng", "shi", "qu", 
-"uusinessLicenseUrl", "education"];
+const UnitBasicConfig = ["userId", "unitName", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", 
+"uusinessLicenseUrl", "addres", "sheng", "shi", "qu", "uscc", "unitName"];
 const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", 
-"yuanXiaoBanGongFuZeRenZhiWu", "yuanXiaoBanGongFuZeRenDianHua", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "yuanXiaoJianZhuMianJi",
-"yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang"];
+"yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua",
+"jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
 
 export async function unitMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
@@ -81,7 +81,12 @@ export async function unitMemberDetails({id}) {
     let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
     /**处理枚举值 */
     topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
-    let basicInfo = extractData(oldInfo, UnitBasicConfig);
+    let basicInfo:any = extractData(oldInfo, UnitBasicConfig);
+    /**获取订单表新社会信用代码和新发票抬头 */
+    let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
+    if (!orderInfo || !orderInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    basicInfo.newUscc = orderInfo.newUscc;
+    basicInfo.newUnitName = orderInfo.newUnitName;
     let unitInfo = extractData(oldInfo, UnitConfig);
     
     let oldKeYanInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId:id});
@@ -185,8 +190,8 @@ export async function individualMemberList({name, documentId, phone, individualM
  * @returns {顶部数据, 基本信息, 专业信息, 其他附件}
  */
 
-const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl"];
-const SpecialityConfig = ["unitName", "memberLevel", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
+const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl", "uscc", "unitName"];
+const SpecialityConfig = ["workUnit", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
 
 export async function individualMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
@@ -198,6 +203,10 @@ export async function individualMemberDetails({id}) {
     let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
     basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
     basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
+    let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
+    if (!orderInfo || !orderInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    basicInfo.newUscc = orderInfo.newUscc;
+    basicInfo.newUnitName = orderInfo.newUnitName;
 
     let specialityInfo:any = extractData(oldInfo, SpecialityConfig);
     basicInfo.profCategory = changeEnumValue(PROFCATEGORY, basicInfo.profCategory);

src/config/enum.ts

@@ -536,7 +536,8 @@ export enum ADMINLV {
     党建工作,
     分支机构,
     通知公告,
-    内容管理= 107,
+    内容管理,
+    首页 = 108,
     会员库 = 201,
     审批管理,
     会费管理,

src/data/models/model.ts

@@ -381,7 +381,7 @@ const ModelArray = [
             workTitle:'String',//职称
             studyResume:'String',//学习简历
             workResume:'String',//工作简历
-            profAchievement:'String',//专业成果
+            profAchievement:'String',//专业成果 教研成果
             otherEMP:'String',//其他任职情况
             otherPROF:'String',//其他专业情况
             profCategory:'Number',//专业类别 枚举PROFCATEGORY