修改引用

src/biz/enterprise/enterprise.ts

@@ -4,16 +4,15 @@
  * 包括新注册企业，迁入企业
  * 
  */
-import { EnterpriseParamFormConfig, MoveInEnterpriseParamConfig, RegisterEnterpriseParamConfig } from "../../config/checkParamConfig";
+import * as paramConfig from "../../config/checkParamConfig";
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseInfoConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
-import { changeEnumValue, checkChange, checkParamater, extractData, getDraftId, getTaskId } from "../../util/tools"
-import moment = require("moment");
-import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseListToPage, 查询所有已绑定过的孵化器id, findEnterpriseList, findEnterpriseByDraftId } from "../../data/enterprise/enterprise";
+import * as tools from "../../util/tools";
+import * as enterpriseData from "../../data/enterprise/enterprise";
 import { EnterpriseListConfig } from "../../config/ojbectResultKeyConfig";
-import { findAllFuHuaQi, findAllFuHuaQiOperationNameMap } from "../../data/fuHuaQi/fuhuaqi";
-import { FUHUAINDUSTRY, INDUSTRY, OUTPUTTYPE } from "../../config/enum";
+import * as fuHuaQiData from "../../data/fuHuaQi/fuhuaqi";
+import * as configEnum from "../../config/enum";
 
 
 /**
@@ -24,18 +23,18 @@ import { FUHUAINDUSTRY, INDUSTRY, OUTPUTTYPE } from "../../config/enum";
  * @returns {isSuccess:true/false}
  */
 export async function registerEnterprise(uscc:string, param) {
-    const TaskId = getTaskId(uscc);
+    const TaskId = tools.getTaskId(uscc);
 
-    checkParamater("新注册企业", RegisterEnterpriseParamConfig, param);//校验表单参数
+    tools.checkParamater("新注册企业", paramConfig.RegisterEnterpriseParamConfig, param);//校验表单参数
 
-    let dataBaseInfo = await findEnterpriseByUscc(param.uscc);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
     if ( dataBaseInfo&& dataBaseInfo.uscc)  throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
 
 
-    param.draftId = getDraftId(uscc);//草稿箱id
+    param.draftId =  tools.getDraftId(uscc);//草稿箱id
 
     param.isCreate = true;//标识此次操作是否是新注册企业并不是迁入企业
-    await createEnterprise(uscc, TaskId, param);
+    await enterpriseData.createEnterprise(uscc, TaskId, param);
 
     return {isSuccess:true};
 }
@@ -50,18 +49,18 @@ export async function registerEnterprise(uscc:string, param) {
  */
 export async function updateRegisterEnterprise(uscc:string, param) {
 
-    checkParamater("新注册企业表单修改", EnterpriseParamFormConfig, param,["oldLogonAdd","timeOfImmigration"]);//校验表单参数
+    tools.checkParamater("新注册企业表单修改", paramConfig.EnterpriseParamFormConfig, param,["oldLogonAdd","timeOfImmigration"]);//校验表单参数
 
 
-    let usccSelectDataBaseList = await findEnterpriseList({uscc:param.uscc});
+    let usccSelectDataBaseList = await enterpriseData.findEnterpriseList({uscc:param.uscc});
     usccSelectDataBaseList.forEach(info => {
         if (info.draftId != param.draftId) throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在 不可以修改`);
     });
 
-    let dataBaseInfo = await findEnterpriseByDraftId(param.draftId);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByDraftId(param.draftId);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${param.uscc}这个企业`);
 
-    let changeList = checkChange(param, dataBaseInfo);//比对修改字段
+    let changeList =  tools.checkChange(param, dataBaseInfo);//比对修改字段
     if ( !changeList.length ) throw new BizError(ERRORENUM.数据无更新, `${param.uscc}数据无更新`);
 
     changeList.forEach(key => {
@@ -82,15 +81,15 @@ export async function updateRegisterEnterprise(uscc:string, param) {
  * @returns {isSuccess:true/false}
  */
 export async function moveInEnterprise(uscc:string, param) {
-    const TaskId = getTaskId(uscc);
+    const TaskId =  tools.getTaskId(uscc);
 
-    checkParamater("迁入企业登记", MoveInEnterpriseParamConfig, param, ["oldLogonAdd","timeOfImmigration"]);//校验表单参数
+    tools.checkParamater("迁入企业登记", paramConfig.MoveInEnterpriseParamConfig, param, ["oldLogonAdd","timeOfImmigration"]);//校验表单参数
 
-    let dataBaseInfo = await findEnterpriseByUscc(param.uscc);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
     if ( dataBaseInfo&& dataBaseInfo.uscc)  throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
 
-    param.draftId = getDraftId(uscc);//草稿箱id
-    await createEnterprise(uscc, TaskId, param);
+    param.draftId =  tools.getDraftId(uscc);//草稿箱id
+    await enterpriseData.createEnterprise(uscc, TaskId, param);
 
     return {isSuccess:true};
 }
@@ -105,12 +104,12 @@ export async function moveInEnterprise(uscc:string, param) {
  */
 export async function updateMoveInEnterprise(uscc:string, param) {
 
-    checkParamater("修改迁入企业登记信息", EnterpriseParamFormConfig, param);//校验表单参数
+    tools.checkParamater("修改迁入企业登记信息", paramConfig.EnterpriseParamFormConfig, param);//校验表单参数
 
-    let dataBaseInfo = await findEnterpriseByDraftId(param.draftId);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByDraftId(param.draftId);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${param.uscc}这个企业`);
 
-    let changeList = checkChange(param, dataBaseInfo);
+    let changeList =  tools.checkChange(param, dataBaseInfo);
     if ( !changeList.length ) throw new BizError(ERRORENUM.数据无更新, `${param.uscc}数据无更新`);
 
     changeList.forEach(key => {
@@ -129,10 +128,10 @@ export async function updateMoveInEnterprise(uscc:string, param) {
  * @param uscc 企业统一信用代码
  */
 export async function getEnterpriseByDraftId(draftId:string) {
-    let dataBaseInfo = await findEnterpriseByDraftId(draftId);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByDraftId(draftId);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在draftId=${draftId}这个企业`);
 
-    let data:any = extractData(EnterpriseInfoConfig, dataBaseInfo, false);
+    let data:any =  tools.extractData(EnterpriseInfoConfig, dataBaseInfo, false);
     data.draftId = dataBaseInfo.draftId;
 
     return {data};
@@ -145,12 +144,12 @@ export async function getEnterpriseByDraftId(draftId:string) {
  * @param uscc 企业统一信用代码
  */
 export async function deleteEnterpriseByDraftId(draftId:string) {
-    let dataBaseInfo = await findEnterpriseByDraftId(draftId);
+    let dataBaseInfo = await enterpriseData.findEnterpriseByDraftId(draftId);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在draftId=${draftId}这个企业`);
 
     if (dataBaseInfo.draftLock) throw new BizError(ERRORENUM.已入库的数据不能删除, draftId);
 
-    await deleteEnterprise(draftId);
+    await enterpriseData.deleteEnterprise(draftId);
 
     return {isSuccess:true};
 }
@@ -188,13 +187,13 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
     }
     
     selectParam.draftLock = true;
-    let usccMap = await findAllFuHuaQiOperationNameMap();
-    let dataBaseList = await findEnterpriseListToPage(selectParam, (page-1)*10 );
-    let count = await findEnterpriseCount(selectParam);
+    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();
+    let dataBaseList = await enterpriseData.findEnterpriseListToPage(selectParam, (page-1)*10 );
+    let count = await enterpriseData.findEnterpriseCount(selectParam);
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(EnterpriseListConfig, info, true);
+        let changeData:any =  tools.extractData(EnterpriseListConfig, info, true);
         changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
 
         if (info.enterpriseIsInPut) {
@@ -202,7 +201,7 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
         } else {
             (changeData.isCreate) ? changeData.isCreate = "新注册" : changeData.isCreate = "新迁入";
         }
-        changeData.industry = changeEnumValue(INDUSTRY, changeData.industry);
+        changeData.industry =  tools.changeEnumValue(configEnum.INDUSTRY, changeData.industry);
         
         dataList.push(changeData);
     });
@@ -222,7 +221,7 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
  */
 export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string, industry, isNaturalPersonHolding:number, type:Number) {
     let selectParam:any = {};
-    if (type == OUTPUTTYPE.当前数据) {
+    if (type == configEnum.OUTPUTTYPE.当前数据) {
         // if ( time.length > 0 ) {
         //     let startT = moment(time).startOf('month').valueOf();
         //     let endT = moment(time).endOf('month').valueOf();
@@ -243,19 +242,19 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
         
     }
     
-    let usccMap = await findAllFuHuaQiOperationNameMap();
+    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();
     selectParam.draftLock = true;
-    let dataBaseList = await findEnterpriseList(selectParam );
+    let dataBaseList = await enterpriseData.findEnterpriseList(selectParam );
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(EnterpriseListConfig, info, true);
+        let changeData:any =  tools.extractData(EnterpriseListConfig, info, true);
         changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
         if (info.enterpriseIsInPut) {
             changeData.isCreate = "";
         } else {
             (changeData.isCreate) ? changeData.isCreate = "新注册" : changeData.isCreate = "新迁入";
         }
-        changeData.industry = changeEnumValue(INDUSTRY, changeData.industry);
+        changeData.industry =  tools.changeEnumValue(configEnum.INDUSTRY, changeData.industry);
         dataList.push(changeData);
     });
 
@@ -266,9 +265,9 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
 
 export async function getAffiliationFuHuaQi() {
     let  dataList = [];
-    let list = await 查询所有已绑定过的孵化器id();
+    let list = await enterpriseData.findAllBindFuHuaQi();
 
-    let allList = await findAllFuHuaQi();
+    let allList = await fuHuaQiData.findAllFuHuaQi();
     let distinctMap = {}; // {uscc:name}
     allList.forEach(info => {
         distinctMap[info.uscc] = info.name;

src/biz/enterprise/financing.ts

@@ -7,14 +7,14 @@
 import { FinancingParamConfig, FinancingParamUpdateConfig } from "../../config/checkParamConfig";
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseFinancingInfoConfig } from "../../config/ojbectResultKeyConfig";
-import { createFinancing, deleteEnterpriseFinancing, findFinancingCount, findFinancingInfoByTaskIdAndSucc, findFinancingList, findFinancingListToPage } from "../../data/enterprise/financing";
+import * as financingData from "../../data/enterprise/financing";
 import { FinancingListConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
-import { changeEnumValue, checkChange, checkParamater, extractData, getTaskId } from "../../util/tools";
-import { findEnterpriseInfoByName, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise";
-import { findAllFuHuaQiOperationNameMap, findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi";
+import * as tool from "../../util/tools";
+import * as enterpriseData from "../../data/enterprise/enterprise";
+import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi";
 import moment = require("moment");
-import { FINANCINGROUNDS, FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, INDUSTRY, OUTPUTTYPE } from "../../config/enum";
+import * as configEnum from "../../config/enum";
 
 
 /**
@@ -25,7 +25,7 @@ import { FINANCINGROUNDS, FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, INDUSTRY, OUTPU
  * @returns {isSuccess:true/false}
  */
 export async function createFinancingInfo(uscc:string, param) {
-    checkParamater("录入企业融资信息", FinancingParamConfig, param, ["fuHuaQiInvestment", "fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
+    tool.checkParamater("录入企业融资信息", FinancingParamConfig, param, ["fuHuaQiInvestment", "fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
 
     if (param.fuHuaQiInvestment) {
         let subCheckName = "录入企业融资信息_孵化器是否参与";
@@ -33,24 +33,24 @@ export async function createFinancingInfo(uscc:string, param) {
             fuHuaQiInvestmentAmount:param.fuHuaQiInvestmentAmount,
             fuHuaQiInvestmentStyle:param.fuHuaQiInvestmentStyle,
         };
-        checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"Number", fuHuaQiInvestmentStyle:"Number"}, subCheckData);
+        tool.checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"Number", fuHuaQiInvestmentStyle:"Number"}, subCheckData);
     } else {
         param.fuHuaQiInvestmentAmount = 0;
         param.fuHuaQiInvestmentStyle = 0;
     }
     /**校验企业是否存在 */
-    let enterpriseInfo = await findEnterpriseInfoByName(param.name);
+    let enterpriseInfo = await enterpriseData.findEnterpriseInfoByName(param.name);
     if (!enterpriseInfo) throw new BizError(ERRORENUM.该企业不存在, uscc, param.name);
 
     param.uscc = enterpriseInfo.uscc;//前端无需传入企业的uscc  库中需要企业的uscc
 
-    const TaskId = getTaskId(uscc);
+    const TaskId = tool.getTaskId(uscc);
     
     /**一个企业一个月只能填报一次融资信息 */
-    let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, param.uscc);
+    let dataBaseInfo = await financingData.findFinancingInfoByTaskIdAndSucc(TaskId, param.uscc);
     if ( dataBaseInfo&& dataBaseInfo.uscc) throw new BizError(ERRORENUM.该企业当月数据已存在, `${param.uscc}的融资信息已经存在`);
 
-    await createFinancing(uscc, TaskId, enterpriseInfo.uscc, enterpriseInfo.logonTime,enterpriseInfo.industry || [], param);
+    await financingData.createFinancing(uscc, TaskId, enterpriseInfo.uscc, enterpriseInfo.logonTime,enterpriseInfo.industry || [], param);
 
     return {isSuccess:true};
 }
@@ -65,7 +65,7 @@ export async function createFinancingInfo(uscc:string, param) {
  * @returns {isSuccess:true/false}
  */
 export async function updateFinancingInfo(uscc:string, param) {
-    checkParamater("更新融资企业信息", FinancingParamUpdateConfig, param, ["fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
+    tool.checkParamater("更新融资企业信息", FinancingParamUpdateConfig, param, ["fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
 
     if (param.fuHuaQiInvestment) {
         let subCheckName = "录入企业融资信息_孵化器是否参与";
@@ -73,17 +73,17 @@ export async function updateFinancingInfo(uscc:string, param) {
             fuHuaQiInvestmentAmount:param.fuHuaQiInvestmentAmount,
             fuHuaQiInvestmentStyle:param.fuHuaQiInvestmentStyle,
         };
-        checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"Number", fuHuaQiInvestmentStyle:"Number"}, subCheckData);
+        tool.checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"Number", fuHuaQiInvestmentStyle:"Number"}, subCheckData);
     } else {
         param.fuHuaQiInvestmentAmount = 0;
         param.fuHuaQiInvestmentStyle = 0;
     }
 
-    const TaskId = getTaskId(uscc);
-    let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, param.uscc);
+    const TaskId = tool.getTaskId(uscc);
+    let dataBaseInfo = await financingData.findFinancingInfoByTaskIdAndSucc(TaskId, param.uscc);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${TaskId}的任务`);
    
-    let changeList = checkChange(param, dataBaseInfo);
+    let changeList = tool.checkChange(param, dataBaseInfo);
     if ( !changeList.length ) throw new BizError(ERRORENUM.数据无更新, `${param.uscc}数据无更新`);
     changeList.forEach(key => {
         dataBaseInfo[key] = param[key];
@@ -103,12 +103,12 @@ export async function updateFinancingInfo(uscc:string, param) {
  * @returns {data:{}}  表单
  */
 export async function getEnterpriseFinancingByUscc(fuHuaQiUscc:string, uscc:string) {
-    const TaskId = getTaskId(fuHuaQiUscc);
+    const TaskId = tool.getTaskId(fuHuaQiUscc);
 
-    let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, uscc);
+    let dataBaseInfo = await financingData.findFinancingInfoByTaskIdAndSucc(TaskId, uscc);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业的本次融资数据`);
 
-    let data = extractData(EnterpriseFinancingInfoConfig, dataBaseInfo, false);
+    let data = tool.extractData(EnterpriseFinancingInfoConfig, dataBaseInfo, false);
 
     return {data};
 }
@@ -122,14 +122,14 @@ export async function getEnterpriseFinancingByUscc(fuHuaQiUscc:string, uscc:stri
  * @returns {isSuccess:true/false}
  */
 export async function deleteEnterpriseFinancingByUscc(fuHuaQiUscc:string, uscc:string) {
-    const TaskId = getTaskId(fuHuaQiUscc);
+    const TaskId = tool.getTaskId(fuHuaQiUscc);
 
-    let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, uscc);
+    let dataBaseInfo = await financingData.findFinancingInfoByTaskIdAndSucc(TaskId, uscc);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业`);
 
     if (dataBaseInfo.draftLock) throw new BizError(ERRORENUM.已入库的数据不能删除, uscc);
 
-    await deleteEnterpriseFinancing(uscc, TaskId);
+    await financingData.deleteEnterpriseFinancing(uscc, TaskId);
 
     return {isSuccess:true};
 }
@@ -142,7 +142,7 @@ export async function deleteEnterpriseFinancingByUscc(fuHuaQiUscc:string, uscc:s
  * @returns []  name:企业名称, logonAdd:注册地址, operatingAdd:经营地址
  */
 export async function getFuHuaQiEnterpriseForSelect(uscc:string) {
-    let enterpriseList = await findEnterpriseListByFuHuaQiUsccName(uscc);
+    let enterpriseList = await enterpriseData.findEnterpriseListByFuHuaQiUsccName(uscc);
 
     let dataList = [];
     enterpriseList.forEach( info => {
@@ -171,7 +171,7 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
 
     let fuHuaQiUscc = "";
     if (fuHuaQiName.length > 0) {
-        let fuHuaQiInfo = await findFuHuaQiByName(fuHuaQiName);
+        let fuHuaQiInfo = await fuhuaqiData.findFuHuaQiByName(fuHuaQiName);
         if(fuHuaQiInfo) fuHuaQiUscc = fuHuaQiInfo.uscc;
     }
 
@@ -188,18 +188,18 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
     }
         
 
-    let dataBaseList = await findFinancingListToPage(selectParam, (page-1)*10 );
-    let count = await findFinancingCount(selectParam);
-    let usccMap = await findAllFuHuaQiOperationNameMap();
+    let dataBaseList = await financingData.findFinancingListToPage(selectParam, (page-1)*10 );
+    let count = await financingData.findFinancingCount(selectParam);
+    let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
     
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(FinancingListConfig, info, true);
+        let changeData:any = tool.extractData(FinancingListConfig, info, true);
         
         changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
-        changeData.industry = changeEnumValue(INDUSTRY, info.industry);
-        changeData.financingRounds = changeEnumValue(FINANCINGROUNDS, info.financingRounds);
-        changeData.fuHuaQiInvestmentStyle = changeEnumValue(FUHUAQILNVESTMENTSTYLE, info.fuHuaQiInvestmentStyle);
+        changeData.industry = tool.changeEnumValue(configEnum.INDUSTRY, info.industry);
+        changeData.financingRounds = tool.changeEnumValue(configEnum.FINANCINGROUNDS, info.financingRounds);
+        changeData.fuHuaQiInvestmentStyle = tool.changeEnumValue(configEnum.FUHUAQILNVESTMENTSTYLE, info.fuHuaQiInvestmentStyle);
         dataList.push(changeData);
     });
 
@@ -221,10 +221,10 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
 export async function outPutFinancingList(monthData:string, fuHuaQiName:string, industry, fuHuaQiInvestment:number, type:number) { 
     let selectParam:any = {};
 
-    if (type == OUTPUTTYPE.当前数据 ) {
+    if (type == configEnum.OUTPUTTYPE.当前数据 ) {
         let fuHuaQiUscc = "";
         if (fuHuaQiName.length > 0) {
-            let fuHuaQiInfo = await findFuHuaQiByName(fuHuaQiName);
+            let fuHuaQiInfo = await fuhuaqiData.findFuHuaQiByName(fuHuaQiName);
             if(fuHuaQiInfo) fuHuaQiUscc = fuHuaQiInfo.uscc;
         }
     
@@ -242,14 +242,14 @@ export async function outPutFinancingList(monthData:string, fuHuaQiName:string,
             
     }
 
-    let dataBaseList = await findFinancingList(selectParam );
+    let dataBaseList = await financingData.findFinancingList(selectParam );
     let dataList = [];
-    let usccMap = await findAllFuHuaQiOperationNameMap();
+    let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
     
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(FinancingListConfig, info, true);
+        let changeData:any = tool.extractData(FinancingListConfig, info, true);
         changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
-        changeData.industry = changeEnumValue(INDUSTRY, info.industry);
+        changeData.industry = tool.changeEnumValue(configEnum.INDUSTRY, info.industry);
         dataList.push(changeData);
     });
 

src/biz/fuHuqQi/base.ts

@@ -5,11 +5,11 @@
  * 
  */
 import { BaseParamUpdateConfig, OrganizationParamUpdateConfig } from "../../config/checkParamConfig";
-import { findEnterpriseCount, findEnterpriseCountByFuHuaQiUscc, groupFindEnterprise } from "../../data/enterprise/enterprise";
-import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiList, findFuHuaQiListByPage } from "../../data/fuHuaQi/fuhuaqi";
+import { findEnterpriseCountByFuHuaQiUscc, groupFindEnterprise } from "../../data/enterprise/enterprise";
+import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi";
 import * as tools from "../../util/tools";
-import { FuHuaQiHomeDataConfig, FuHuaQiBaseListConfig, FuHuaQiBaseDataConfig, OrganizationBaseDataConfig } from "../../config/ojbectResultKeyConfig";
-import { DEGREE, FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INSTITUTIONALNATURE, OPERATIONMODEL, OUTPUTTYPE, SEX, TEAM } from "../../config/enum";
+import * as resultConfig from "../../config/ojbectResultKeyConfig";
+import * as configEnum from "../../config/enum";
 import { extractData } from "../../util/tools";
 import { BizError } from "../../util/bizError";
 import { ERRORENUM } from "../../config/errorEnum";
@@ -23,13 +23,13 @@ import { ERRORENUM } from "../../config/errorEnum";
  * @returns {} "incubatedAcreage", "acreageTotal", "acreagePersonalUse", "name", "lv", "institutionalNature"
  */
 export async function homeData(uscc:string) {
-    let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
+    let dataBaseInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
 
-    let data:any = extractData(FuHuaQiHomeDataConfig, dataBaseInfo, false);
+    let data:any = extractData(resultConfig.FuHuaQiHomeDataConfig, dataBaseInfo, false);
 
     data.enterpriseCount  = await findEnterpriseCountByFuHuaQiUscc(uscc);
-    data.lv = tools.changeEnumValue(FUHUAQILV, dataBaseInfo.lv);
-    data.institutionalNature = tools.changeEnumValue(INSTITUTIONALNATURE, dataBaseInfo.institutionalNature);
+    data.lv = tools.changeEnumValue(configEnum.FUHUAQILV, dataBaseInfo.lv);
+    data.institutionalNature = tools.changeEnumValue(configEnum.INSTITUTIONALNATURE, dataBaseInfo.institutionalNature);
 
     return data;
 }
@@ -42,11 +42,11 @@ export async function homeData(uscc:string) {
  * @returns data 基础数据字段
  */
 export async function selectFuHuaQiBaseData(uscc:string) {
-    let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
+    let dataBaseInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
 
     let enterpriseTotal = await findEnterpriseCountByFuHuaQiUscc(uscc); //企业总数
     
-    let data:any = extractData(FuHuaQiBaseDataConfig, dataBaseInfo, false);
+    let data:any = extractData(resultConfig.FuHuaQiBaseDataConfig, dataBaseInfo, false);
     
     data.enterpriseTotal = enterpriseTotal;
     data.numOfEntities = enterpriseTotal - dataBaseInfo.virtualEnterpriseNum; //企业总数 - 虚拟企业数量
@@ -62,9 +62,9 @@ export async function selectFuHuaQiBaseData(uscc:string) {
  * @returns data 基础数据字段
  */
 export async function selectOrganizationInfo(uscc:string) {
-    let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
+    let dataBaseInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     
-    let data:any = extractData(OrganizationBaseDataConfig, dataBaseInfo, false);
+    let data:any = extractData(resultConfig.OrganizationBaseDataConfig, dataBaseInfo, false);
 
     return data;
 }
@@ -83,7 +83,7 @@ export async function updateFuHuaQiBaseData(uscc:string, param) {
     ];
     tools.checkParamater("更新孵化器基础数据", BaseParamUpdateConfig, param, skipKeyList);
 
-    let baseDataInfo = await findFuHuaQiByUSCC(uscc);
+    let baseDataInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     for (let key in param) {
         if (key == "hatchingGround") {
             param[key].forEach (info => {
@@ -123,7 +123,7 @@ export async function updateOrganizationData(uscc:string, param) {
     ];
     tools.checkParamater("更新孵化器基础数据", OrganizationParamUpdateConfig, param, skipKeyList);
 
-    let baseDataInfo = await findFuHuaQiByUSCC(uscc);
+    let baseDataInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
         
     /**这里无法判断数组里面的内容是否有变化 所以 hatchingGround 直接赋值  */
     let changeList = tools.checkChange(param, baseDataInfo);
@@ -163,13 +163,13 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
 
     let enterpriseMap = await groupFindEnterprise();//企业总数
 
-    let dataBaseList = await findFuHuaQiListByPage(selectParam, (page-1)*10 );
+    let dataBaseList = await fuhuaqiData.findFuHuaQiListByPage(selectParam, (page-1)*10 );
 
-    let count = await findFuHuaQiCount(selectParam);
+    let count = await fuhuaqiData.findFuHuaQiCount(selectParam);
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info, true);
+        let changeData:any = tools.extractData(resultConfig.FuHuaQiBaseListConfig, info, true);
         // let hatchingGround = info.hatchingGround;
         // hatchingGround.forEach (info => {
         //     let {personInChargeAdd, siteAcreage, leasePrice} = info;
@@ -184,10 +184,10 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
         changeData.enterpriseTotal = enterpriseTotal;
         changeData.numOfEntities = numOfEntities;
 
-        changeData.lv = tools.changeEnumValue(FUHUAQILV, changeData.lv);
-        changeData.industry = tools.changeEnumValue(FUHUAINDUSTRY, changeData.industry);
-        changeData.institutionalNature = tools.changeEnumValue(INSTITUTIONALNATURE, changeData.institutionalNature);
-        changeData.operationModel = tools.changeEnumValue(OPERATIONMODEL, changeData.operationModel);
+        changeData.lv = tools.changeEnumValue(configEnum.FUHUAQILV, changeData.lv);
+        changeData.industry = tools.changeEnumValue(configEnum.FUHUAINDUSTRY, changeData.industry);
+        changeData.institutionalNature = tools.changeEnumValue(configEnum.INSTITUTIONALNATURE, changeData.institutionalNature);
+        changeData.operationModel = tools.changeEnumValue(configEnum.OPERATIONMODEL, changeData.operationModel);
         if (changeData.operationModel == "_投资__孵化_类型"){
             changeData.operationModel = changeData.operationModel.replace("__","+");
             changeData.operationModel = changeData.operationModel.replace("_","“");
@@ -199,13 +199,13 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
         if (changeData.foundingTeam && changeData.foundingTeam.length) {
             changeData.foundingTeam.forEach(item => {
                 let {memberName,  memberAge,  memberSchool,  des} = item;
-                let type = tools.changeEnumValue(TEAM, item.type);//人才类型
+                let type = tools.changeEnumValue(configEnum.TEAM, item.type);//人才类型
                 foundingTeam.push({
                     memberName,  memberAge,  memberSchool,  des, type,
-                    memberSex : tools.changeEnumValue(SEX, item.memberSex),//成员性别
-                    memberDEGREE : tools.changeEnumValue(DEGREE, item.memberDEGREE),//成员最高学历
+                    memberSex : tools.changeEnumValue(configEnum.SEX, item.memberSex),//成员性别
+                    memberDEGREE : tools.changeEnumValue(configEnum.DEGREE, item.memberDEGREE),//成员最高学历
                 });
-                // item.memberDEGREE = tools.changeEnumValue(DEGREE, item.foundingTeamStr);//成员最高学历
+                // item.memberDEGREE = tools.changeEnumValue(configEnum.DEGREE, item.foundingTeamStr);//成员最高学历
                 /* 这里兼容了一下，团队类型数据库里存到了每一个人的信息里 以防后续要修改 */
                 changeData.foundingTeamStr = type;
             });
@@ -230,7 +230,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
 export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:number, industry:number, type:Number) {
     let selectParam:any = {};
 
-    if (type == OUTPUTTYPE.当前数据) {
+    if (type == configEnum.OUTPUTTYPE.当前数据) {
         if (lv) selectParam.lv = lv;
         if (institutionalNature) selectParam.institutionalNature = institutionalNature;
         if (industry) selectParam.industry = industry;
@@ -238,11 +238,11 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
 
     let enterpriseMap = await groupFindEnterprise();//企业总数
 
-    let dataBaseList = await findFuHuaQiList(selectParam);
+    let dataBaseList = await fuhuaqiData.findFuHuaQiList(selectParam);
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info, true);
+        let changeData:any = tools.extractData(resultConfig.FuHuaQiBaseListConfig, info, true);
 
         let enterpriseTotal = enterpriseMap[info.uscc] || 0;
         let numOfEntities = enterpriseTotal - (info.virtualEnterpriseNum || 0 );
@@ -251,10 +251,10 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
         changeData.enterpriseTotal = enterpriseTotal;
         changeData.numOfEntities = numOfEntities;
 
-        changeData.lv = tools.changeEnumValue(FUHUAQILV, changeData.lv);
-        changeData.industry = tools.changeEnumValue(FUHUAINDUSTRY, changeData.industry);
-        changeData.institutionalNature = tools.changeEnumValue(INSTITUTIONALNATURE, changeData.institutionalNature);
-        changeData.operationModel = tools.changeEnumValue(OPERATIONMODEL, changeData.operationModel);
+        changeData.lv = tools.changeEnumValue(configEnum.FUHUAQILV, changeData.lv);
+        changeData.industry = tools.changeEnumValue(configEnum.FUHUAINDUSTRY, changeData.industry);
+        changeData.institutionalNature = tools.changeEnumValue(configEnum.INSTITUTIONALNATURE, changeData.institutionalNature);
+        changeData.operationModel = tools.changeEnumValue(configEnum.OPERATIONMODEL, changeData.operationModel);
         if (changeData.operationModel == "_投资__孵化_类型"){
             changeData.operationModel = changeData.operationModel.replace("__","+");
             changeData.operationModel = changeData.operationModel.replace("_","“");
@@ -266,13 +266,13 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
         if (changeData.foundingTeam && changeData.foundingTeam.length) {
             changeData.foundingTeam.forEach(item => {
                 let {memberName,  memberAge,  memberSchool,  des} = item;
-                let type = tools.changeEnumValue(TEAM, item.type);//人才类型
+                let type = tools.changeEnumValue(configEnum.TEAM, item.type);//人才类型
                 foundingTeam.push({
                     memberName,  memberAge,  memberSchool,  des, type,
-                    memberSex : tools.changeEnumValue(SEX, item.memberSex),//成员性别
-                    memberDEGREE : tools.changeEnumValue(DEGREE, item.memberDEGREE),//成员最高学历
+                    memberSex : tools.changeEnumValue(configEnum.SEX, item.memberSex),//成员性别
+                    memberDEGREE : tools.changeEnumValue(configEnum.DEGREE, item.memberDEGREE),//成员最高学历
                 });
-                // item.memberDEGREE = tools.changeEnumValue(DEGREE, item.foundingTeamStr);//成员最高学历
+                // item.memberDEGREE = tools.changeEnumValue(configEnum.DEGREE, item.foundingTeamStr);//成员最高学历
                 /* 这里兼容了一下，团队类型数据库里存到了每一个人的信息里 以防后续要修改 */
                 changeData.foundingTeamStr = type;
             });

src/biz/fuHuqQi/month.ts

@@ -7,7 +7,7 @@
 import { ERRORENUM } from "../../config/errorEnum";
 import { BizError } from "../../util/bizError";
 import * as monthData from "../../data/fuHuaQi/monthTable";
-import { changeEnumValue, extractData, getTaskId } from "../../util/tools";
+import { extractData, getTaskId } from "../../util/tools";
 import { findAllFuHuaQiOperationNameMap } from "../../data/fuHuaQi/fuhuaqi";
 import { MonthConfig } from "../../config/ojbectResultKeyConfig";
 import { OUTPUTTYPE } from "../../config/enum";

src/biz/fuHuqQi/task.ts

@@ -11,8 +11,8 @@ import { ERRORENUM } from "../../config/errorEnum";
 import { findEnterpriseListByTaskId, updateEnterpriseDraftLock } from "../../data/enterprise/enterprise";
 import { findFinancingListByTaskId, updateFinancingDraftLock } from "../../data/enterprise/financing";
 import { findAllFuHuaQi } from "../../data/fuHuaQi/fuhuaqi";
-import { createMonthTableToList, findMonthTableByTaskId, findmonthTableListByTaskId } from "../../data/fuHuaQi/monthTable";
-import { findEnterpriseByTaskIdAndType, createTaskToList, findFuHuaQiTaskByTaskId, findTaskCountByKey } from "../../data/fuHuaQi/task";
+import * as monthTableData from "../../data/fuHuaQi/monthTable";
+import * as taskData from "../../data/fuHuaQi/task";
 import { BizError } from "../../util/bizError";
 import { logHandle } from "../../util/log";
 import { getTaskId, getTimeKey } from "../../util/tools";
@@ -28,7 +28,7 @@ export async function fuHuaQiTaskList(uscc:string) {
     let result = [];
 
     const TaskId = getTaskId(uscc);
-    let taskMap = await findFuHuaQiTaskByTaskId(TaskId);
+    let taskMap = await taskData.findFuHuaQiTaskByTaskId(TaskId);
 
     // let taskTypeMapConf = {};
     for (let key in TASKTYPEENUM) {
@@ -45,7 +45,7 @@ export async function fuHuaQiTaskList(uscc:string) {
                 let dataList = [];
 
                 switch(keyNumber) {
-                    case TASKTYPEENUM.孵化器月度填报: dataList = await findmonthTableListByTaskId(TaskId); break;
+                    case TASKTYPEENUM.孵化器月度填报: dataList = await monthTableData.findmonthTableListByTaskId(TaskId); break;
                     case TASKTYPEENUM.新注册或迁入企业登记: 
                         dataList = await findEnterpriseListByTaskId(TaskId);
                         dataList.forEach(item => {
@@ -77,14 +77,14 @@ export async function fuHuaQiTaskList(uscc:string) {
  */
 export async function checkTask(uscc:string, taskType:number) {
     const TaskId = getTaskId(uscc);
-    let taskInfo = await findEnterpriseByTaskIdAndType(TaskId, taskType);
+    let taskInfo = await taskData.findEnterpriseByTaskIdAndType(TaskId, taskType);
 
     if (!taskInfo) throw new BizError(ERRORENUM.任务不存在, uscc, TaskId);
     if ( taskInfo.isSubmit ) throw new BizError(ERRORENUM.不能重复提交任务, uscc, taskType);
 
     switch (taskType) {
         case TASKTYPEENUM.孵化器月度填报:
-            let monthTableInfo = await findMonthTableByTaskId(TaskId);
+            let monthTableInfo = await monthTableData.findMonthTableByTaskId(TaskId);
             if (!monthTableInfo.isUpdate) throw new BizError(ERRORENUM.该报表需要填写本月内容后提交, uscc, taskType);
             if ( monthTableInfo.draftLock ) throw new BizError(ERRORENUM.不能重复提交任务, uscc, taskType, '月度表lock = true');
             
@@ -118,7 +118,7 @@ export async function checkTask(uscc:string, taskType:number) {
  */
 export async function provideTask() {
     const TimeKey = getTimeKey();
-    let taskCount = await findTaskCountByKey(TimeKey);
+    let taskCount = await taskData.findTaskCountByKey(TimeKey);
     if (taskCount) {}//todo 重复创建了任务
 
     let fuHuaQiList = await findAllFuHuaQi();
@@ -166,10 +166,10 @@ export async function provideTask() {
 
 
     try {
-        await createTaskToList(addList);
+        await taskData.createTaskToList(addList);
         
          /**添加月度填报表 */
-        await createMonthTableToList(monthList);
+        await monthTableData.createMonthTableToList(monthList);
         logHandle(`添加了${addList.length}`);
     } catch (err) {
         //todo添加异常了

src/biz/fuHuqQi/user.ts

@@ -9,7 +9,7 @@ import { ERRORENUM } from "../../config/errorEnum";
 import { FuHuaQiListConfig } from "../../config/ojbectResultKeyConfig";
 import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi"
 import { BizError } from "../../util/bizError";
-import { checkChange, checkParamater, extractData, getPwdMd5, getToken } from "../../util/tools";
+import * as tools from "../../util/tools";
 
 
 /**
@@ -23,10 +23,10 @@ export async function login(uscc:string, pwd:string) {
     let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     if(!fuhuaqiInfo) throw new BizError(ERRORENUM.账号不存在);
 
-    let checkPwd = getPwdMd5(fuhuaqiInfo.uscc, pwd);
+    let checkPwd = tools.getPwdMd5(fuhuaqiInfo.uscc, pwd);
     if (fuhuaqiInfo.pwd != checkPwd) throw new BizError(ERRORENUM.密码错误);
 
-    const Token = getToken(uscc);
+    const Token = tools.getToken(uscc);
     
     let fuhuaqiUserInfo = {
         uscc: fuhuaqiInfo.uscc,
@@ -56,7 +56,7 @@ export async function firstLoginChangePwd(uscc:string, pwd:string, confirmPwd:st
     let dataBaseInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     if (dataBaseInfo.firstLoginIsChangePwd) throw new BizError(ERRORENUM.不能重复修改密码, `重复调用了首次登录之后的修改密码接口${uscc}`);
     //todo 校验密码
-    dataBaseInfo.pwd = getPwdMd5(uscc, pwd);
+    dataBaseInfo.pwd = tools.getPwdMd5(uscc, pwd);
     dataBaseInfo.firstLoginIsChangePwd = true;
     await dataBaseInfo.save();
 
@@ -82,9 +82,9 @@ export async function changePassword(uscc:string, pwd:string, newPwd:string) {
     }
     let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     if (!fuhuaqiInfo) throw new BizError(ERRORENUM.未找到数据);
-    let checkPwd = getPwdMd5(fuhuaqiInfo.uscc, pwd);
+    let checkPwd = tools.getPwdMd5(fuhuaqiInfo.uscc, pwd);
     if (fuhuaqiInfo.pwd != checkPwd) throw new BizError(ERRORENUM.密码错误);
-    fuhuaqiInfo.pwd = getPwdMd5(uscc, newPwd);
+    fuhuaqiInfo.pwd = tools.getPwdMd5(uscc, newPwd);
     await fuhuaqiInfo.save();
 
     return {isSuccess:true};
@@ -127,7 +127,7 @@ export async function logout(uscc:string){
     let count = await fuhuaqiData.findFuHuaQiUserCount(selectParam);
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData = extractData(FuHuaQiListConfig, info, true);
+        let changeData = tools.extractData(FuHuaQiListConfig, info, true);
         const Count = enterpriseMap[info.uscc] || 0;
         dataList.push(changeData);
     });
@@ -161,7 +161,7 @@ export async function updateState(uscc:string, userState:boolean) {
  * @returns 
  */
 export async function addUser(param) {
-    checkParamater("新增孵化器账号信息", FuHuaQiUserConfig, param);//校验表单参数
+    tools.checkParamater("新增孵化器账号信息", FuHuaQiUserConfig, param);//校验表单参数
 
 
     let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(param.uscc);

src/data/enterprise/enterprise.ts

@@ -190,7 +190,11 @@ export async function findEnterpriseListByFuHuaQiUsccName(fuHuaQiUscc:string) {
 }
 
 
-export async function 查询所有已绑定过的孵化器id() {
+/**
+ * 查询所有已绑定过的孵化器id
+ * @returns [孵化器id]
+ */
+export async function findAllBindFuHuaQi() {
     return await enterpriseModel.distinct('fuHuaQiUscc');
 }