代码优化1

src/biz/admin/fuHuaQi/fuHuaQi.ts

@@ -62,7 +62,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
         selectParam.operationName = {"$regex":`${name}`};
     }
 
-    let enterpriseMap = await enterpriseData.groupFindEnterpriseCount();//计算孵化器拥有的企业总数
+    let enterpriseMap = await enterpriseData.groupFindEnterpriseCount();//计算孵化器拥有的累计企业数量
 
     let dataBaseList = await fuhuaqiData.findFuHuaQiListByPage(selectParam, (page-1)*10 );
     let count = await fuhuaqiData.findFuHuaQiCount(selectParam);
@@ -75,7 +75,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
 
         const EnterpriseTotal = enterpriseMap[info.uscc] || 0; //企业总数
         let numOfEntities = EnterpriseTotal - (info.virtualEnterpriseNum || 0 ); //实体企业
-        changeData.enterpriseTotal = EnterpriseTotal;
+        changeData.enterpriseTotal = EnterpriseTotal; //在孵化企业总数
         changeData.numOfEntities = numOfEntities < 0 ? 0 : numOfEntities;
 
         /**备案地址转换 */
@@ -354,8 +354,8 @@ export async function fuHuaQiUserList(operationName:string, page:number) {
         selectParam.operationName = {"$regex":`${operationName}`};
     }
 
-    let dataBaseList = await fuhuaqiData.findFuHuaQiUserList(selectParam, (page-1)*10 );
-    let count = await fuhuaqiData.findFuHuaQiUserCount(selectParam);
+    let dataBaseList = await fuhuaqiData.findFuHuaQiListByPage(selectParam, (page-1)*10 );
+    let count = await fuhuaqiData.findFuHuaQiCount(selectParam);
     let dataList = [];
     dataBaseList.forEach( info => {
         let changeData:any = extractData(splitResultConfig.FuHuaQiListConfig, info, true);

src/biz/admin/fuHuaQi/instituQualify.ts

 import moment = require("moment");
 import { COOPERATIONMODE, OPERATIONMODEL, OUTPUTTYPE, SPECIALITY, STATEENUM, TEACHERLV } from "../../../config/enum";
-import { findAllFuHuaQiOperationNameMap, findFuHuaQiList, findFuHuaQiOperationNameMapByParam, findFuHuaQiUserCount, findFuHuaQiUserList } from "../../../data/fuHuaQi/fuhuaqi";
+import { findFuHuaQiList, findFuHuaQiOperationNameMapByParam, findFuHuaQiCount, findFuHuaQiListByPage } from "../../../data/fuHuaQi/fuhuaqi";
 import { distinctFuHuaQiRegister, findI18nRegisterListByParam, findI18nRegisterListByParamToPage, getI18nRegisterCountByParam } from "../../../data/fuHuaQi/instituQualify/i18nRegister";
 import * as icrData from "../../../data/fuHuaQi/instituQualify/icr";
 import * as startupTeacherData from "../../../data/fuHuaQi/instituQualify/startupTeacher";
@@ -292,8 +292,8 @@ export async function getPTPDataList(name:string, isCreatePTP:number, isParticip
         else selectParam.isParticipateInPTP = false;
     }
 
-    let dataBaseList = await findFuHuaQiUserList(selectParam, (page-1)*10);
-    let count = await findFuHuaQiUserCount(selectParam);
+    let dataBaseList = await findFuHuaQiListByPage(selectParam, (page-1)*10);
+    let count = await findFuHuaQiCount(selectParam);
     let dataList = [];
     dataBaseList.forEach(info => {
         dataList.push({
@@ -346,8 +346,8 @@ export async function getProfessionalTechnologyDataList(name:string, isProfessio
         selectParam["$and"] = [{"professionalTechnologyCreateTime":{"$gt":st}}, {"professionalTechnologyCreateTime":{"$lt":et}}];
     }
 
-    let dataBaseList = await findFuHuaQiUserList(selectParam, (page-1)*10);
-    let count = await findFuHuaQiUserCount(selectParam);
+    let dataBaseList = await findFuHuaQiListByPage(selectParam, (page-1)*10);
+    let count = await findFuHuaQiCount(selectParam);
     let dataList = [];
     dataBaseList.forEach(info => {
         let professionalTechnologyCreateTime = '';

src/data/fuHuaQi/fuhuaqi.ts

@@ -109,6 +109,7 @@ export async function findFuHuaQiByUSCC(uscc:string) {
     return await fuHuaQiModel.selectOnceData({uscc});
 }
 
+
 /**
  * 通过孵化器名称获取孵化器信息
  * @param name 孵化器名称
@@ -120,17 +121,6 @@ export async function findFuHuaQiByName(name:string) {
 
 
 /**
- * 通过token获取孵化器信息   弃用
- * 中间件使用
- * @param token token
- * @returns 孵化器信息
- */
-export async function findFuHuaQiByToken(token:string) {
-    return await fuHuaQiModel.findOne({token}).exec();
-}
-
-
-/**
  * 分页获取符合条件的孵化器列表
  * @param selectParam 查询参数
  * @param skipCount 跳过数量
@@ -140,10 +130,10 @@ export async function findFuHuaQiListByPage(selectParam, skipCount) {
     return await fuHuaQiModel.find(selectParam).skip(skipCount).limit(10);
 }
 
+
 /**
  * 获取符合条件的所有孵化器列表
  * @param selectParam 查询参数
- * @param skipCount 跳过数量
  * @returns [] 孵化器列表
  */
 export async function findFuHuaQiList(selectParam) {
@@ -174,6 +164,7 @@ export async function findAllFuHuaQiOperationNameMap() {
     return map;
 }
 
+
 /**
  * 获取所有运营机构名称的map
  * @returns map key:统一信用代码 value:运营机构名称
@@ -187,6 +178,7 @@ export async function findFuHuaQiOperationNameMapByParam(param) {
     return map;
 }
 
+
 /**
  * 获取所有运营机构的map
  * @returns map key:运营机构名称 value:uscc
@@ -200,6 +192,7 @@ export async function findAllFuHuaQiOperationUsccMap() {
     return map;
 }
 
+
 /**
  * 聚合查询 孵化器所拥有的企业数量
  * @returns {} key=孵化器统一信用 value=企业数量
@@ -215,29 +208,8 @@ export async function findAllFuHuaQiOperationUsccMap() {
     return result;
 }
 
-
 /**
- * 获取所有孵化器
- * @param selectParam 查询参数
- * @param skipCount 跳过数量
- * @returns [] 孵化器列表
- */
- export async function findFuHuaQiUserList(selectParam, skipCount) {
-    return await fuHuaQiModel.find(selectParam).skip(skipCount).limit(10);
-}
-
-/**
- * 获取所有孵化器
- * @param selectParam 查询参数
- * @returns number 数据数量
- */
- export async function findFuHuaQiUserCount(selectParam) {
-    return await fuHuaQiModel.find(selectParam).countDocuments();
-}
-
-
-/**
- * 查询所有非禁用状态下的孵化器
+ * 查询所有非禁用状态下的孵化器列表
  * 限制返回字段     uscc
  *                  operationName
  * @returns []
@@ -257,6 +229,10 @@ export async function createFuHuaQiUser(param) {
 }
 
 
+/**
+ * 创建多个孵化器
+ * @param fuHuaQiList 
+ */
 export async function createFuHuaQiToList(fuHuaQiList:object) {
     await fuHuaQiModel.insertMany(fuHuaQiList);
 }
@@ -272,6 +248,12 @@ export async function findFuHuaQiByBindId(bindId:string) {
 }
 
 
+/**
+ * 返回特定字段
+ * @param param 参数
+ * @param files 所返回的字段
+ * @returns 
+ */
 export async function findFuHuaQiFilesDataByParam(param, files) {
     return await fuHuaQiModel.find(param, files);
 }
\ No newline at end of file

src/tools/dataInit.ts

@@ -5,7 +5,7 @@
 import { FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INDUSTRY, INSTITUTIONALNATURE } from "../config/enum";
 import { createEnterpriseToList, findEnterpriseCount } from "../data/enterprise/enterprise";
 import { findFinancingCount } from "../data/fuHuaQi/monthTask/financing";
-import { createFuHuaQiToList, findAllFuHuaQiOperationUsccMap, findAllNotDisabledFuHuaQi, findFuHuaQiUserCount } from "../data/fuHuaQi/fuhuaqi";
+import { createFuHuaQiToList, findAllFuHuaQiOperationUsccMap, findAllNotDisabledFuHuaQi, findFuHuaQiCount } from "../data/fuHuaQi/fuhuaqi";
 import { createMonthTableToList, findMonthCount } from "../data/fuHuaQi/monthTask/monthTable";
 import { getPwdMd5 } from "./system";
 import * as taskTool from "./taskTool";
@@ -81,7 +81,7 @@ export async function initBasicData() {
 }
 
 async function initFuHuaQiData() {
-    let count =  await findFuHuaQiUserCount({});
+    let count =  await findFuHuaQiCount({});
     if (count > 1) {
         console.log("*** 孵化器数据 无需初始化");
         return;