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

src/biz/register.ts

@@ -2,16 +2,16 @@
  * 注册流程
  */
 
-import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITINFOTYPE, USERREGISTERSTATE } from "../config/enum";
+import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";
 import { ERRORENUM } from "../config/errorEnum";
 import { addManyData, addOneData } from "../data/add";
 import { TABLEENUM } from "../data/models/model";
-import { findCount, findOnce, findOnceToSort } from "../data/select";
+import { find, findCount, findOnce, findOnceToSort } from "../data/select";
 import { updateOneData } from "../data/update";
 import * as sysTools from "../tools/system";
 import { BizError } from "../util/bizError";
 import { extractData } from "../util/piecemeal";
-import { eccEnumValue } from "../util/verificationEnum";
+import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
 
 
 /**
@@ -175,7 +175,7 @@ export async function unitMemberRegister2({form, keyanForm, userId}) {
     const EccFuncName = '注册单位会员流程2';
     eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
     eccEnumValue(EccFuncName, '院校办学类型', BANXUELEIXING, form.yuanXiaoBanXueLeiXing);
-    eccEnumValue(EccFuncName, '单位信息类型', UNITINFOTYPE, form.unitInfoType);
+    eccEnumValue(EccFuncName, '单位会员类型', UNITMEMBERTYPE, form.unitMemberType);
 
     form.registerFlow = REGISTERFLOW.完成第二步;
     await updateOneData(TABLEENUM.用户表, {userId}, form);
@@ -271,3 +271,76 @@ export async function memberRegisterSendCode({phone}) {
 
     return {code:Code};
 }
+
+
+/**
+ * 单位会员回显【流程二】
+ * @param userId 
+ * @returns {基本信息, 单位信息, 单位所获得科研成果}
+ */
+
+const UnitBasicConfig = ["userId", "unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", 
+"contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl"];
+const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoBanGongFuZeRenZhiWu", 
+"yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", 
+"jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
+
+export async function unitMemberEcho2({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    let basicInfo:any = extractData(oldInfo, UnitBasicConfig);
+    let unitInfo:any = extractData(oldInfo, UnitConfig);
+    /**处理枚举值 */
+    unitInfo.unitMemberType = changeEnumValue(UNITMEMBERTYPE, unitInfo.unitMemberType);
+    unitInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, unitInfo.yuanXiaoBanXueLeiXing);
+    
+    let oldKeYanInfo = await find(TABLEENUM.单位所获得科研成果表, {userId});
+    let scientificResearch = extractData(oldKeYanInfo, ["id", "startTime", "endTime", "describe"]);
+    
+    return {basicInfo, unitInfo, scientificResearch};
+}
+
+
+/**
+ * 单位会员回显【流程三】
+ * @param userId 
+ * @returns 
+ */
+export async function unitMemberEcho3({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["applicationForm"]);
+    if (!oldInfo || !oldInfo.applicationForm) throw new BizError(ERRORENUM.目标数据不存在);
+
+    return {dataInfo:oldInfo};
+}
+
+
+/**
+ * 个人会员回显【流程二】
+ * @param param0 
+ * @returns {基本信息, 专业信息, 其他附件}
+ */
+
+const IndividualBasicConfig = ["name", "sex", "documentType", "documentId", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "photoUrl"];
+const SpecialityConfig = ["unitName", "memberLevel", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
+
+export async function individualMemberDetails({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
+    topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
+
+    let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
+    basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
+    basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
+
+    let specialityInfo:any = extractData(oldInfo, SpecialityConfig);
+    basicInfo.profCategory = changeEnumValue(PROFCATEGORY, basicInfo.profCategory);
+    
+    let otherAttachment:any = extractData(oldInfo, ["cardUrl", "academicCERTUrl", "professionalCERTUrl", "auxiliaryMaterial"]);
+    
+    return {topInfo, basicInfo, specialityInfo, otherAttachment};
+}
+
+
+

src/routers/member/router.ts

@@ -3,6 +3,7 @@ import * as memberBiz from "../../biz/member/member";
 import * as examineBiz from "../../biz/member/examine";
 import * as memberFeesBiz from "../../biz/member/memberFees";
 import * as authorityBiz from "../../biz/member/authority";
+import * as registerBiz from "../../biz/register";
 
 export const FirstName = '会员管理路由';
 export const FirstRouter = '/manage/member';
@@ -24,7 +25,7 @@ export const Config = {
                     }
                 }
             ],
-            bindBiz:memberBiz.memberRegister1
+            bindBiz:registerBiz.memberRegister1
         },
         {
             apiName:"个人入会流程2",
@@ -64,7 +65,7 @@ export const Config = {
                     key:"userId", type:"String", desc:"用户id"
                 }
             ],
-            bindBiz:memberBiz.memberRegister2
+            bindBiz:registerBiz.memberRegister2
         },
         {
             apiName:"单位入会流程1",
@@ -83,7 +84,7 @@ export const Config = {
                 },
                 {key:"codeId", type:"String", desc:"验证码Id"}
             ],
-            bindBiz:memberBiz.unitMemberRegister1
+            bindBiz:registerBiz.unitMemberRegister1
         },
         {
             apiName:"单位入会流程2",
@@ -131,7 +132,7 @@ export const Config = {
                     key:"userId", type:"String", desc:"用户id"
                 }
             ],
-            bindBiz:memberBiz.unitMemberRegister2
+            bindBiz:registerBiz.unitMemberRegister2
         },
         {
             apiName:"单位入会流程3",
@@ -144,7 +145,7 @@ export const Config = {
                     key:"userId", type:"String", desc:"用户id"
                 }
             ],
-            bindBiz:memberBiz.unitMemberRegister3
+            bindBiz:registerBiz.unitMemberRegister3
         },
         {
             apiName:"发送短信验证码",
@@ -154,7 +155,7 @@ export const Config = {
                 {key:"phone", type:"String", desc:"联系人手机号"},
                 {key:"codeType", type:"Number", desc:"验证码类型枚举"}
             ],
-            bindBiz:memberBiz.memberRegisterSendCode
+            bindBiz:registerBiz.memberRegisterSendCode
         },
         {
             apiName:"获取当前会员注册流程",
@@ -162,7 +163,7 @@ export const Config = {
             param:[
                 {key:"userId", type:"String", desc:"用户id"},
             ],
-            bindBiz:memberBiz.registerFlowType
+            bindBiz:registerBiz.registerFlowType
         }
     ],
     "登陆相关":[