优化孵化器引用 剔除孵化器数据层中冗余方法

src/biz/admin/fuHuaQi/task.ts

@@ -7,8 +7,7 @@ import * as taskData from "../../../data/fuHuaQi/monthTask/task";
 import * as fuhuaqiData from "../../../data/fuHuaQi/fuhuaqi";
 import { BizError } from "../../../util/bizError";
 import { ERRORENUM } from "../../../config/errorEnum";
-import { findQuarterTaskByParam, findQuarterTaskByParamToPage } from "../../../data/fuHuaQi/quarterTask/quarterTask";
-import { findBusinessByTaskIdList, findBusinessDataByParam, findBusinessDataByParamToPage, findBusinessDataCountByParam } from "../../../data/fuHuaQi/quarterTask/businessData";
+import { findBusinessDataByParam, findBusinessDataByParamToPage, findBusinessDataCountByParam } from "../../../data/fuHuaQi/quarterTask/businessData";
 
 
 /**

src/biz/admin/stats/fuHuaQi/baseData.ts

@@ -5,7 +5,6 @@
 
 import moment = require("moment");
 import { GuanWeiHuiChnageFuHuaQiBaseConfig } from "../../../../config/eccParam/admin";
-import { OrganizationParamUpdateConfig } from "../../../../config/eccParam/fuHuaQi";
 import { FUHUAINDUSTRY, FUHUAQILV, INDUSTRY, INSTITUTIONALNATURE, OPERATIONMODEL, SCOREWAYS, STATEENUM } from "../../../../config/enum";
 import { ERRORENUM } from "../../../../config/errorEnum";
 import { StarConfig } from "../../../../config/scoreConfig";
@@ -35,7 +34,7 @@ export async function fuHuaQiBaseData(uscc:string) {
     let foundingTeamCount = fuHuaQiInfo.foundingTeam ? fuHuaQiInfo.foundingTeam.length : 0; //创业团队
     let hatchingGroundCount = fuHuaQiInfo.hatchingGround ? fuHuaQiInfo.hatchingGround.length : 0; //经备案孵化场地
     //张江以为布局数量+国际化登记数量=基地数量
-    let baseCount = await i18nRegisterData.getCount(uscc) + await zjBeyondLayoutData.getCount(uscc);
+    let baseCount = await i18nRegisterData.getI18nRegisterCountByParam({uscc}) + await zjBeyondLayoutData.getZjBeyondLayoutCountByParam({uscc});
 
     const BaseData = {
         name, acreageTotal, incubatedAcreage, acreagePersonalUse, foundingTeamCount, hatchingGroundCount, baseCount

src/biz/admin/stats/fuHuaQi/valueAnalysis.ts

@@ -12,8 +12,8 @@ import { findBusinessDataByParam } from "../../../../data/fuHuaQi/quarterTask/bu
 
 export async function getValueStats(uscc) {
     const ThisYear = new Date().getFullYear();
-    let i18nCount = await i18nRegisterData.getCount(uscc);//国际合作/大企业合作机构数
-    let icrCount = await icrData.getCount(uscc); //大学/科研院所合作机构
+    let i18nCount = await i18nRegisterData.getI18nRegisterCountByParam({uscc});//国际合作/大企业合作机构数
+    let icrCount = await icrData.getIcrCountByParam({uscc}); //大学/科研院所合作机构
 
     /**季度任务查询条件 */
     let queryDataMap = { };//格式 {"YYYY-季度":{TP:0, member:0, index:1}},

src/biz/admin/stats/guanWeiHui/fuHuaQiWarning.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { findMonthCount, getLowOccupancyRateForMonthData, statsFuHuaQiMonthDataCount } from "../../../../data/fuHuaQi/monthTask/monthTable";
+import { findMonthTableListCount, getLowOccupancyRateForMonthData, statsFuHuaQiMonthDataCount } from "../../../../data/fuHuaQi/monthTask/monthTable";
 import { findTaskCountByParamCount, statsFuHuaQiTaskReportingRate } from "../../../../data/fuHuaQi/monthTask/task";
 import { findAllFuHuaQiOperationNameMap, findFuHuaQiFilesDataByParam } from "../../../../data/fuHuaQi/fuhuaqi";
 import { findBusinessDataByParam } from "../../../../data/fuHuaQi/quarterTask/businessData";
@@ -21,7 +21,7 @@ export async function fuHuaQiWarningOverView() {
     let dataMonth = moment().subtract(1, 'months').month();
 
     let monthTableDataCount = await statsFuHuaQiMonthDataCount(dataYear, dataMonth);
-    let monthTableCount = await findMonthCount({year:dataYear, month:dataMonth, draftLock:true});
+    let monthTableCount = await findMonthTableListCount({year:dataYear, month:dataMonth, draftLock:true});
     let monthAvg = Math.round(monthTableDataCount/monthTableCount) //平均出租率
 
     /**填报率 = 三种任务的填报实际填报/三种任务的应填报 */

src/biz/mobileFuHuaQi/enterprise/enterprise.ts

@@ -13,7 +13,7 @@ import * as taskTool from "../../../tools/taskTool";
 import * as enterpriseData from "../../../data/enterprise/enterprise";
 import * as splitResultConfig from "../../../config/splitResultConfig";
 import * as configEnum from "../../../config/enum";
-import { eccFormParam, eccReqParamater } from "../../../util/verificationParam";
+import { eccFormParam } from "../../../util/verificationParam";
 import * as verificationEnumTools from "../../../util/verificationEnum";
 import { checkChange, extractData } from "../../../util/piecemeal";
 

src/biz/mobileFuHuaQi/enterprise/toExamine.ts

@@ -4,9 +4,9 @@
  * 
  */
 
-import { findBusinessDataByParams, findBusinessDataByTimeAndUscc, findBusinessDataCountByParamsToPage } from "../../../data/enterprise/quarterTask/businessdata";
+import * as businessData from "../../../data/enterprise/quarterTask/businessdata";
 import { ENTERPRISEDECLARATIONTYPE } from "../../../config/enum";
-import { findTeamDataByParams, findTeamDataByUsccAndTime, findTeamDataCountByParams } from "../../../data/enterprise/quarterTask/team";
+import * as teamData from "../../../data/enterprise/quarterTask/team";
 import { eccEnumValue } from "../../../util/verificationEnum";
 import { eccFormParam } from "../../../util/verificationParam";
 import * as eccFormParamConfig from "../../../config/eccParam/fuHuaQi";
@@ -36,12 +36,12 @@ export async function unauditedList(uscc:string, state:number, type:number ) {
     let businessDataList = [];
     let teamDataList = []; 
     if (type == 2) {
-        businessDataList = await findBusinessDataByParams(query);
+        businessDataList = await businessData.findBusinessDataByParams(query);
     } else if (type == 3) {
-        teamDataList = await findTeamDataByParams(query); 
+        teamDataList = await teamData.findTeamDataByParams(query); 
     } else {
-        businessDataList = await findBusinessDataByParams(query);
-        teamDataList = await findTeamDataByParams(query); 
+        businessDataList = await businessData.findBusinessDataByParams(query);
+        teamDataList = await teamData.findTeamDataByParams(query); 
     }
 
     let dataList = [];
@@ -77,10 +77,10 @@ export async function unauditedList(uscc:string, state:number, type:number ) {
     });
 
     /**组合dataNumberList */
-    let businessSubmitCount = await findBusinessDataCountByParamsToPage({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:true});
-    let businessNotSubmitCount = await findBusinessDataCountByParamsToPage({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:false});
-    let teamSubmitCount = await findTeamDataCountByParams({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:true});
-    let teamNotSubmitCount = await findTeamDataCountByParams({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:false});
+    let businessSubmitCount = await businessData.findBusinessDataCountByParamsToPage({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:true});
+    let businessNotSubmitCount = await businessData.findBusinessDataCountByParamsToPage({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:false});
+    let teamSubmitCount = await teamData.findTeamDataCountByParams({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:true});
+    let teamNotSubmitCount = await teamData.findTeamDataCountByParams({fhqIsSubmit:false, fuHuaQiUscc:uscc, isSubmit:false});
     
     let dataNumberList = [
         {
@@ -111,7 +111,7 @@ export async function unauditedList(uscc:string, state:number, type:number ) {
 export async function auditCompletedList(uscc:string, year:number, quarter:number) {
     let query = {fhqIsSubmit:true, fuHuaQiUscc:uscc, year:year, quarter:quarter};
 
-    let businessDataList = await findBusinessDataByParams(query);
+    let businessDataList = await businessData.findBusinessDataByParams(query);
 
     let dataList = [];
     businessDataList.forEach(info => {
@@ -123,7 +123,7 @@ export async function auditCompletedList(uscc:string, year:number, quarter:numbe
         });
     });
 
-    let teamDataList = await findTeamDataByParams(query);
+    let teamDataList = await teamData.findTeamDataByParams(query);
     teamDataList.forEach(info => {
         let { name, quarter } = info;
         dataList.push({
@@ -149,7 +149,7 @@ export async function fuHuaQiReplenishEnterpriseDataDeclaration(fuHuaQiUscc:stri
 
     if (type == ENTERPRISEDECLARATIONTYPE.团队信息) {
         eccFormParam("孵化器补充企业数据-团队信息", eccFormParamConfig.FuHuaQiReplenishEnterpriseTeamDataConfig, form);
-        let teamInfo = await findTeamDataByUsccAndTime(uscc, year, quarter);
+        let teamInfo = await teamData.findTeamDataByUsccAndTime(uscc, year, quarter);
         if (teamInfo.fuHuaQiUscc != fuHuaQiUscc) {}
         for (let key in eccFormParamConfig.FuHuaQiReplenishEnterpriseTeamDataConfig) {
             teamInfo[key] = form[key];
@@ -159,7 +159,7 @@ export async function fuHuaQiReplenishEnterpriseDataDeclaration(fuHuaQiUscc:stri
 
     } else {
         eccFormParam("孵化器补充企业数据-经营状况", eccFormParamConfig.FuHuaQiReplenishEnterpriseBusinessDataConfig, form);
-        let businessInfo = await findBusinessDataByTimeAndUscc(uscc, year, quarter);
+        let businessInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, year, quarter);
         if (businessInfo.fuHuaQiUscc != fuHuaQiUscc) {}
 
         for (let key in eccFormParamConfig.FuHuaQiReplenishEnterpriseBusinessDataConfig) {
@@ -188,9 +188,9 @@ export async function fuHuaQiPass(fuHuaQiUscc:string, uscc:string, type:number,
 
     let dataInfo:any = {};
     if (type == ENTERPRISEDECLARATIONTYPE.团队信息) {
-        dataInfo = await findTeamDataByUsccAndTime(uscc, year, quarter);
+        dataInfo = await teamData.findTeamDataByUsccAndTime(uscc, year, quarter);
     } else {
-        dataInfo = await findBusinessDataByTimeAndUscc(uscc, year, quarter);
+        dataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, year, quarter);
     }
     
     if (dataInfo.fhqIsSubmit) throw new BizError(ERRORENUM.重复通过填报数据, `${fuHuaQiUscc} 企业审核 重复通过`);
@@ -211,7 +211,7 @@ export async function fuHuaQiPass(fuHuaQiUscc:string, uscc:string, type:number,
  * @returns 
  */
 export async function selectFuHuaQiReplenishEnterpriseTeamData(fuHuaQiUscc:string,  uscc:string, year:number, quarter:number) {
-    let teamInfo = await findTeamDataByUsccAndTime(uscc, year, quarter);
+    let teamInfo = await teamData.findTeamDataByUsccAndTime(uscc, year, quarter);
     let result = {
         doctor:teamInfo.doctor,//博士
         master:teamInfo.master,//硕士
@@ -235,7 +235,7 @@ export async function selectFuHuaQiReplenishEnterpriseTeamData(fuHuaQiUscc:strin
  * @returns 
  */
 export async function selectFuHuaQiReplenishEnterpriseBusinessData(fuHuaQiUscc:string,  uscc:string, year:number, quarter:number) {
-    let businessInfo = await findBusinessDataByTimeAndUscc(uscc, year, quarter);
+    let businessInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, year, quarter);
     
     let result = {
         BI:businessInfo.BI,//营业收入

src/biz/mobileFuHuaQi/fuHuaQi/base.ts

@@ -5,7 +5,7 @@
  * 
  */
 import * as eccFormParamConfig from "../../../config/eccParam/fuHuaQi";
-import { findEnterpriseCount, findEnterpriseCountByFuHuaQiUscc, findEnterpriseTotalByFuHuaQiUscc } from "../../../data/enterprise/enterprise";
+import * as enterpriseData from "../../../data/enterprise/enterprise";
 import * as fuhuaqiData from "../../../data/fuHuaQi/fuhuaqi";
 import * as splitResultConfig from "../../../config/splitResultConfig";
 import * as configEnum from "../../../config/enum";
@@ -16,7 +16,7 @@ import { eccFormParam, eccReqParamater } from "../../../util/verificationParam";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import * as scoreBiz from "./score";
 import { addPoint } from "../../point";
-import { FUHUAQINODEENUM, OPERATETYPEENUM, POINTTYPEENUM } from "../../../config/pointConfig";
+import { FUHUAQINODEENUM, POINTTYPEENUM } from "../../../config/pointConfig";
 
 
 
@@ -32,7 +32,7 @@ export async function homeData(uscc:string) {
 
     /**根据配置截取返回的字段 */
     let data:any = extractData(splitResultConfig.FuHuaQiHomeDataConfig, dataBaseInfo, false);
-    data.enterpriseCount  = await findEnterpriseCountByFuHuaQiUscc(uscc) || 0;
+    data.enterpriseCount  = await enterpriseData.findEnterpriseCountByFuHuaQiUscc(uscc) || 0;
     data.lv = changeEnumValue(configEnum.FUHUAQILV, dataBaseInfo.lv);
     data.institutionalNature = changeEnumValue(configEnum.INSTITUTIONALNATURE, dataBaseInfo.institutionalNature);
     /**截取小数位 */
@@ -54,16 +54,16 @@ export async function selectFuHuaQiBaseData(uscc:string) {
     /** 这里中间件已经验证过uscc的可靠性了，不需要做多余的验证*/
     let dataBaseInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     /** 虚拟 */
-    let virtualEnterpriseNum = await findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.虚拟孵化, draftLock:true}) || 0;
+    let virtualEnterpriseNum = await enterpriseData.findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.虚拟孵化, draftLock:true}) || 0;
     /**截取返回 */
     let data:any = extractData(splitResultConfig.FuHuaQiBaseDataConfig, dataBaseInfo, false);
-    data.enterpriseTotal =  await findEnterpriseCountByFuHuaQiUscc(uscc); //企业总数
+    data.enterpriseTotal =  await enterpriseData.findEnterpriseCountByFuHuaQiUscc(uscc); //企业总数
     data.numOfEntities = data.enterpriseTotal - virtualEnterpriseNum; //实体企业总数 = 企业总数 - 虚拟企业数量
     data.numOfEntities = data.numOfEntities > 0 ? data.numOfEntities : 0;
     data.virtualEnterpriseNum = virtualEnterpriseNum;
 
     data.fuHuaEnterpriseTotal = dataBaseInfo.fuHuaEnterpriseTotal ? dataBaseInfo.fuHuaEnterpriseTotal : 0;
-    data.fuHuaEnterpriseTotal += await findEnterpriseTotalByFuHuaQiUscc(uscc);
+    data.fuHuaEnterpriseTotal += await enterpriseData.findEnterpriseTotalByFuHuaQiUscc(uscc);
 
     return data;
 }

src/biz/mobileFuHuaQi/fuHuaQi/instituQualify/i18nRegister.ts

@@ -7,7 +7,7 @@
 
 import * as fuhuaqiData from "../../../../data/fuHuaQi/fuhuaqi";
 import { getI18nRegisterId } from "../../../../tools/system";
-import { addRegister, deleteI18nRegisterListById, findI18nRegisterListByParam, findOneI18nRegister } from "../../../../data/fuHuaQi/instituQualify/i18nRegister";
+import * as i18nRegisterData from "../../../../data/fuHuaQi/instituQualify/i18nRegister";
 import { BizError } from "../../../../util/bizError";
 import { ERRORENUM } from "../../../../config/errorEnum";
 import { addPoint } from "../../../point";
@@ -27,7 +27,7 @@ export async function createI18nRegister(uscc:string, country:string, partners:s
     let fuHuaQiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
 
     let id = getI18nRegisterId(uscc);
-    await addRegister(id, uscc, fuHuaQiInfo.name, country, partners, cMode, cAchievements);
+    await i18nRegisterData.addRegister(id, uscc, fuHuaQiInfo.name, country, partners, cMode, cAchievements);
 
     addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_国际化登记, {country, partners, cMode, cAchievements}, null, OPERATETYPEENUM.添加 );
     
@@ -46,7 +46,7 @@ export async function createI18nRegister(uscc:string, country:string, partners:s
  * @returns 
  */
 export async function updateI18nRegister(uscc:string, id:string, country:string, partners:string, cMode:string, cAchievements:string) {
-    let registerInfo = await findOneI18nRegister(id);
+    let registerInfo = await i18nRegisterData.findOneI18nRegister(id);
     if (uscc != registerInfo.uscc) throw new BizError(ERRORENUM.参数错误, "修改国际化登记信息时", `${uscc}尝试修改${registerInfo.uscc}的信息`);
 
     let oldData = {
@@ -76,7 +76,7 @@ export async function updateI18nRegister(uscc:string, id:string, country:string,
  * @returns 
  */
 export async function selectI18nRegisterInfo(id:string) {
-    let registerInfo = await findOneI18nRegister(id);
+    let registerInfo = await i18nRegisterData.findOneI18nRegister(id);
 
     let registerData = {
         country : registerInfo.country,
@@ -95,7 +95,7 @@ export async function selectI18nRegisterInfo(id:string) {
  * @returns 
  */
 export async function deleteI18nRegisterInfo(uscc:string, id:string) {
-    let registerInfo = await findOneI18nRegister(id);
+    let registerInfo = await i18nRegisterData.findOneI18nRegister(id);
     if (uscc != registerInfo.uscc) throw new BizError(ERRORENUM.参数错误, "删除国际化登记信息时", `${uscc}尝试修改${registerInfo.uscc}的信息`);
 
     let oldData = {
@@ -107,7 +107,7 @@ export async function deleteI18nRegisterInfo(uscc:string, id:string) {
 
     addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_国际化登记, oldData, null, OPERATETYPEENUM.删除 );
 
-    await deleteI18nRegisterListById(id);
+    await i18nRegisterData.deleteI18nRegisterListById(id);
 
     return {isSuccess:true} 
 }
@@ -119,7 +119,7 @@ export async function deleteI18nRegisterInfo(uscc:string, id:string) {
  * @returns 
  */
 export async function i18nRegisterListData(uscc) {
-    let registerList = await findI18nRegisterListByParam({uscc});
+    let registerList = await i18nRegisterData.findI18nRegisterListByParam({uscc});
 
     let dataList = [];
     registerList.forEach(info => {

src/biz/mobileFuHuaQi/fuHuaQi/instituQualify/icr.ts

@@ -11,7 +11,7 @@ import { changeEnumValue } from "../../../../util/verificationEnum";
 import { COOPERATIONMODE } from "../../../../config/enum";
 import moment = require("moment");
 import { addPoint } from "../../../point";
-import { FUHUAQINODEENUM, OPERATETYPEENUM, POINTTYPEENUM } from "../../../../config/pointConfig";
+import * as pointConfig from "../../../../config/pointConfig";
 import { BizError } from "../../../../util/bizError";
 import { ERRORENUM } from "../../../../config/errorEnum";
 
@@ -32,7 +32,7 @@ export async function createIcr(uscc:string, po:string, ce:string, cMode, startT
     let id = getRandomId(uscc);
     await icrData.addData(id, uscc, fuHuaQiInfo.name, po, ce, cMode, startTimeMs);
 
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_大学科研院所合作机构, {po, ce, cMode, startTimeMs}, null, OPERATETYPEENUM.添加 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_大学科研院所合作机构, {po, ce, cMode, startTimeMs}, null, pointConfig.OPERATETYPEENUM.添加 );
     
     return {isSuccess:true};
 }
@@ -59,7 +59,7 @@ export async function updateIcr(uscc:string, id:string, po:string, ce:string, cM
         startTimeMs : dataInfo.startTimeMs,
     };
     let newData = { po, ce, cMode, startTimeMs };
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_大学科研院所合作机构, oldData, newData, OPERATETYPEENUM.修改 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_大学科研院所合作机构, oldData, newData, pointConfig.OPERATETYPEENUM.修改 );
 
     dataInfo.po = po;
     dataInfo.ce = ce;
@@ -111,7 +111,7 @@ export async function deleteIcr(uscc:string, id:string) {
     await icrData.deleteDataById(id);
 
 
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_大学科研院所合作机构, oldData, null, OPERATETYPEENUM.删除 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_大学科研院所合作机构, oldData, null, pointConfig.OPERATETYPEENUM.删除 );
     return {isSuccess:true} 
 }
 

src/biz/mobileFuHuaQi/fuHuaQi/instituQualify/instiuQualify.ts

@@ -10,7 +10,7 @@ import * as zjBeyondLayoutData from "../../../../data/fuHuaQi/instituQualify/zjB
 import { STATEENUM } from "../../../../config/enum";
 import * as fuhuaqiData from "../../../../data/fuHuaQi/fuhuaqi";
 import { addPoint } from "../../../point";
-import { FUHUAQINODEENUM, OPERATETYPEENUM, POINTTYPEENUM } from "../../../../config/pointConfig";
+import * as pointConfig from "../../../../config/pointConfig";
 
 
 /**
@@ -34,7 +34,7 @@ export async function updatePTPInfo(uscc:string, isCreatePTP:number, scalePTP:nu
     };
     let newData = { isCreatePTP, scalePTP, isParticipateInPTP, participatingFundCompany };
 
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_创投基金登记, oldData, newData, OPERATETYPEENUM.修改 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_创投基金登记, oldData, newData, pointConfig.OPERATETYPEENUM.修改 );
 
     fuHuaQiInfo.isCreatePTP = isCreatePTP;
     fuHuaQiInfo.scalePTP = scalePTP;
@@ -101,7 +101,7 @@ export async function updateProfessionalTechnology(uscc:string, isProfessionalTe
         cooperationInstitutions,
     };
 
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_专业技术平台登记, oldData, newData, OPERATETYPEENUM.修改 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_专业技术平台登记, oldData, newData, pointConfig.OPERATETYPEENUM.修改 );
 
     fuHuaQiInfo.isProfessionalTechnology= isProfessionalTechnology;//是否专业技术平台
     fuHuaQiInfo.professionalTechnologyName= professionalTechnologyName;//专业技术平台名称
@@ -143,10 +143,10 @@ export async function getProfessionalTechnology(uscc:string) {
  * @returns 
  */
 export async function overview(uscc:string) {
-    let i18n = await i18nRegisterData.getCount(uscc);
-    let icr = await icrData.getCount(uscc);
-    let startupteacher = await startupTeacherData.getCount(uscc);
-    let zjbeyondlayout = await zjBeyondLayoutData.getCount(uscc);
+    let i18n = await i18nRegisterData.getI18nRegisterCountByParam({uscc});
+    let icr = await icrData.getIcrCountByParam({uscc});
+    let startupteacher = await startupTeacherData.getStartupTeacherCountByParam({uscc});
+    let zjbeyondlayout = await zjBeyondLayoutData.getZjBeyondLayoutCountByParam({uscc});
     let fuHuaQiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
     let data = {
         i18n,

src/biz/mobileFuHuaQi/fuHuaQi/instituQualify/startupTeacher.ts

@@ -9,7 +9,7 @@ import * as startupTeacherData  from "../../../../data/fuHuaQi/instituQualify/st
 import { changeEnumValue } from "../../../../util/verificationEnum";
 import { SPECIALITY, TEACHERLV } from "../../../../config/enum";
 import { addPoint } from "../../../point";
-import { FUHUAQINODEENUM, OPERATETYPEENUM, POINTTYPEENUM } from "../../../../config/pointConfig";
+import * as pointConfig from "../../../../config/pointConfig";
 import { BizError } from "../../../../util/bizError";
 import { ERRORENUM } from "../../../../config/errorEnum";
 
@@ -33,7 +33,7 @@ export async function createStartUpTeacher(uscc:string, teacherName:string, unit
     await startupTeacherData.addData(id, uscc, fuHuaQiInfo.name, teacherName, unit, duties, speciality, teacherLv, serviceEnterprises);
 
     let pointData = {teacherName, unit, duties, speciality, teacherLv, serviceEnterprises};
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_创业导师情况, pointData, null, OPERATETYPEENUM.添加 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_创业导师情况, pointData, null, pointConfig.OPERATETYPEENUM.添加 );
     
     return {isSuccess:true};
 }
@@ -64,7 +64,7 @@ export async function updateStartUpTeacher(uscc:string, id:string, teacherName:s
         teacherLv:dataInfo.teacherLv,
         serviceEnterprises:dataInfo.serviceEnterprises
     };
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_创业导师情况, oldData, newData, OPERATETYPEENUM.修改 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_创业导师情况, oldData, newData, pointConfig.OPERATETYPEENUM.修改 );
 
     dataInfo.teacherName = teacherName; 
     dataInfo.unit = unit; 
@@ -117,7 +117,7 @@ export async function deleteStartUpTeacher(uscc:string, id:string) {
         teacherLv:dataInfo.teacherLv,
         serviceEnterprises:dataInfo.serviceEnterprises
     };
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_创业导师情况, oldData, null, OPERATETYPEENUM.删除 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_创业导师情况, oldData, null, pointConfig.OPERATETYPEENUM.删除 );
 
     await startupTeacherData.deleteDataById(id);
 

src/biz/mobileFuHuaQi/fuHuaQi/instituQualify/zjBeyondLayout.ts

@@ -10,7 +10,7 @@ import * as zjBeyondLayoutData  from "../../../../data/fuHuaQi/instituQualify/zj
 import { changeEnumValue } from "../../../../util/verificationEnum";
 import { ZJBEYONDLAYOUTOPERATIONMODE } from "../../../../config/enum";
 import { addPoint } from "../../../point";
-import { FUHUAQINODEENUM, OPERATETYPEENUM, POINTTYPEENUM } from "../../../../config/pointConfig";
+import * as pointConfig from "../../../../config/pointConfig";
 import { BizError } from "../../../../util/bizError";
 import { ERRORENUM } from "../../../../config/errorEnum";
 
@@ -30,7 +30,7 @@ export async function createZJBeyondLayout(uscc:string, city:string, area:number
     await zjBeyondLayoutData.addData(id, uscc, fuHuaQiInfo.name, city, area, operationMode);
 
     let pointData = {city, area, operationMode};
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_张江以外布局, pointData, null, OPERATETYPEENUM.添加 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_张江以外布局, pointData, null, pointConfig.OPERATETYPEENUM.添加 );
 
     return {isSuccess:true};
 }
@@ -54,7 +54,7 @@ export async function updateZJBeyondLayout(uscc:string, id:string, city:string,
         operationMode:dataInfo.operationMode,
     };
     let newData = {city, area, operationMode};
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_张江以外布局, oldData, newData, OPERATETYPEENUM.修改 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_张江以外布局, oldData, newData, pointConfig.OPERATETYPEENUM.修改 );
 
     dataInfo.city = city; 
     dataInfo.area = area; 
@@ -98,7 +98,7 @@ export async function deleteZJBeyondLayout(uscc:string, id:string) {
         area:dataInfo.area,
         operationMode:dataInfo.operationMode,
     };
-    addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.机构资质_张江以外布局, oldData, null, OPERATETYPEENUM.删除 );
+    addPoint(pointConfig.POINTTYPEENUM.孵化器, uscc, pointConfig.FUHUAQINODEENUM.机构资质_张江以外布局, oldData, null, pointConfig.OPERATETYPEENUM.删除 );
 
     await zjBeyondLayoutData.deleteDataById(id);
 

src/biz/mobileFuHuaQi/fuHuaQi/month.ts

@@ -13,11 +13,8 @@ import { ERRORENUM } from "../../../config/errorEnum";
 import { BizError } from "../../../util/bizError";
 import * as monthData from "../../../data/fuHuaQi/monthTask/monthTable";
 import { extractData } from "../../../util/piecemeal";
-import * as sysTools from "../../../tools/system";
 import * as taskTool from "../../../tools/taskTool";
-import { findAllFuHuaQiOperationNameMap } from "../../../data/fuHuaQi/fuhuaqi";
 import * as splitResultConfig from "../../../config/splitResultConfig";
-import { OUTPUTTYPE } from "../../../config/enum";
 import moment = require("moment");
 
 /**

src/biz/mobileFuHuaQi/fuHuaQi/task/monthTask.ts

@@ -13,10 +13,10 @@
  */
 
 import moment = require("moment");
-import { QUARTERTASKTYPEENUM, SCOREWAYS, TASKTYPEENUM } from "../../../../config/enum";
+import { SCOREWAYS, TASKTYPEENUM } from "../../../../config/enum";
 import { ERRORENUM } from "../../../../config/errorEnum";
-import { findEnterpriseByUscc, findEnterpriseCount, findEnterpriseList, findEnterpriseListByTaskId, updateEnterpriseDraftLock } from "../../../../data/enterprise/enterprise";
-import { findFinancingCount, findFinancingListByTaskId, updateFinancingDraftLock } from "../../../../data/fuHuaQi/monthTask/financing";
+import * as enterpriseData from "../../../../data/enterprise/enterprise";
+import * as financingData from "../../../../data/fuHuaQi/monthTask/financing";
 import { findAllNotDisabledFuHuaQi } from "../../../../data/fuHuaQi/fuhuaqi";
 import * as monthTableData from "../../../../data/fuHuaQi/monthTask/monthTable";
 import * as taskData from "../../../../data/fuHuaQi/monthTask/task";
@@ -65,14 +65,14 @@ export async function fuHuaQiTaskList(uscc:string) {
                     break;
                     case TASKTYPEENUM.新注册或迁入企业登记:
                         /**限制 draftLock = false 即草稿数据 这里可以不用这个限制 */
-                        dataList = await findEnterpriseListByTaskId(TaskId, false);
+                        dataList = await enterpriseData.findEnterpriseListByTaskId(TaskId, false);
                         dataList.forEach(item => {
                             item.uscc = item.draftId;//这里转换一下，为了不改前端代码 使用uscc这个名称，但是实际是draftId
                         });
                     break;
                     case TASKTYPEENUM.融资企业填报:
                         /**限制 draftLock = false 即草稿数据 这里可以不用这个限制 */
-                        dataList = await findFinancingListByTaskId(TaskId, false); 
+                        dataList = await financingData.findFinancingListByTaskId(TaskId, false); 
                     break;
                 }
             
@@ -132,14 +132,14 @@ export async function fuHuaQiCompletedList(uscc:string, selectTime:number) {
                     break;
                     case TASKTYPEENUM.新注册或迁入企业登记:
                         /**限制 draftLock = false 即草稿数据 这里可以不用这个限制 */
-                        dataList = await findEnterpriseListByTaskId(TaskId, true);
+                        dataList = await enterpriseData.findEnterpriseListByTaskId(TaskId, true);
                         dataList.forEach(item => {
                             item.uscc = item.draftId;//这里转换一下，为了不改前端代码 使用uscc这个名称，但是实际是draftId
                         });
                     break;
                     case TASKTYPEENUM.融资企业填报:
                         /**限制 draftLock = false 即草稿数据 这里可以不用这个限制 */
-                        dataList = await findFinancingListByTaskId(TaskId, true); 
+                        dataList = await financingData.findFinancingListByTaskId(TaskId, true); 
                     break;
                 }
             
@@ -228,15 +228,15 @@ export async function checkTask(uscc:string, taskType:number) {
         break;
         case TASKTYPEENUM.新注册或迁入企业登记:
             /**将录入的企业数据 draftLock 改为 true 表示不再是草稿状态  */
-            await updateEnterpriseDraftLock(TaskId);
-            submitCount = await findEnterpriseCount({taskId:TaskId});
+            await enterpriseData.updateEnterpriseDraftLock(TaskId);
+            submitCount = await enterpriseData.findEnterpriseCount({taskId:TaskId});
             /**更新分数 */
             await scoreBiz.updateScore(uscc, SCOREWAYS.任务得分, true, TASKTYPEENUM.新注册或迁入企业登记);
         break;
         case TASKTYPEENUM.融资企业填报:
             /**将录入的融资数据 draftLock 改为 true 表示不再是草稿状态  */
-            await updateFinancingDraftLock(TaskId);
-            submitCount = await findFinancingCount({taskId:TaskId});
+            await financingData.updateFinancingDraftLock(TaskId);
+            submitCount = await financingData.findFinancingCount({taskId:TaskId});
             /**更新分数 */
             await scoreBiz.updateScore(uscc, SCOREWAYS.任务得分, true, TASKTYPEENUM.融资企业填报);
         break;
@@ -260,7 +260,7 @@ export async function checkTask(uscc:string, taskType:number) {
  */
 export async function provideMonthTask() {
     const TimeKey = taskTool.getTimeKey();
-    let taskCount = await taskData.findTaskCountByKey(TimeKey);
+    let taskCount = await taskData.findTaskCountByParamCount({key:TimeKey});
     if (taskCount) {
         new BizError(ERRORENUM.系统错误, '重复创建了任务');
         return;
@@ -320,10 +320,10 @@ export async function retrieveMonthTask() {
     logHandle(`${TimeKey} 任务回收成功=> 分数更新成功(${notSubmitList.length})条`);
 
     /**初始化企业密码 */
-    let notPwdEnterpriseList = await findEnterpriseList({pwd:null});
+    let notPwdEnterpriseList = await enterpriseData.findEnterpriseList({pwd:null});
     for (let i = 0; i < notPwdEnterpriseList.length; i++) {
         let dataItem = notPwdEnterpriseList[i];
-        let info = await findEnterpriseByUscc(dataItem.uscc);
+        let info = await enterpriseData.findEnterpriseByUscc(dataItem.uscc);
         info.pwd = getPwdMd5(info.uscc, md5PwdStr(dataItem.uscc.slice(dataItem.uscc.length-6)));
 
         await info.save();

src/biz/mobileFuHuaQi/fuHuaQi/user.ts

 /**
  * 孵化器用户逻辑层 
- * 作者: 陈金晶
+ * 作者: lxm
  * 主要包括有 孵化器账号的登录 
  * 预留好  重置密码  退出登录 接口 
  * 密码规则：6-18位 只允许有数字和字符，可以只有数字也可以只有字母 不允许有特殊字符 2023年02月21日确定需求

src/biz/mobileFuHuaQi/policy.ts

@@ -3,13 +3,11 @@
  */
 
 import moment = require("moment");
-import { selectInformationByParamCount, selectInformationByParamToPage, selectInformationDataById, selectOnceInformationByParamToParam } from "../../data/guanWeiHui/information";
+import * as informationData from "../../data/guanWeiHui/information";
 import { FUHUAQINODEENUM, POINTTYPEENUM } from "../../config/pointConfig";
 import { addPoint } from "../point";
 
 
-
-
 /**
  * 获取资讯列表
  * 
@@ -23,8 +21,8 @@ export async function getInformationList(uscc:string, selectTitle:string, page:n
     if (selectTitle) {
         selectParam["title"] =  {"$regex":`${selectTitle}`};
     }
-    let informationList = await selectInformationByParamToPage(selectParam, (page-1) * 10 );
-    let count = await selectInformationByParamCount(selectParam);
+    let informationList = await informationData.selectInformationByParamToPage(selectParam, (page-1) * 10 );
+    let count = await informationData.selectInformationByParamCount(selectParam);
     let pageCount = count ? Math.ceil(count/10) : 0;
 
     let dataList = [];
@@ -53,8 +51,8 @@ export async function getOutOfDateInformationList(uscc:string, selectTitle:strin
     if (selectTitle) {
         selectParam["title"] =  {"$regex":`${selectTitle}`};
     }
-    let informationList = await selectInformationByParamToPage(selectParam, (page-1) * 10 );
-    let count = await selectInformationByParamCount(selectParam);
+    let informationList = await informationData.selectInformationByParamToPage(selectParam, (page-1) * 10 );
+    let count = await informationData.selectInformationByParamCount(selectParam);
     let pageCount = count ? Math.ceil(count/10) : 0;
     let dataList = [];
 
@@ -75,13 +73,13 @@ export async function getOutOfDateInformationList(uscc:string, selectTitle:strin
  * @param id 标识
  */
 export async function getOnceinformation(uscc:string, id:string) {
-    let informationData = await selectInformationDataById(id );
+    let baseData = await informationData.selectInformationDataById(id );
 
     let reuslt = {
-        title:informationData.title,
-        desc:informationData.desc,
-        source:informationData.source,
-        createTime:moment(informationData.createTimeMs).format("MM/DD")
+        title:baseData.title,
+        desc:baseData.desc,
+        source:baseData.source,
+        createTime:moment(baseData.createTimeMs).format("MM/DD")
     };
 
     addPoint(POINTTYPEENUM.孵化器, uscc, FUHUAQINODEENUM.政策速递, id);
@@ -96,7 +94,7 @@ export async function getOnceinformation(uscc:string, id:string) {
  */
 export async function getInformationTitleList() {
     let selectParam = {state:true, "$or":[{closeTimeMs: {"$gt":new Date().valueOf()} }, {isPermanent:true}] };
-    let informationData= await selectOnceInformationByParamToParam(selectParam) || {title:""};
+    let baseData = await informationData.selectOnceInformationByParamToParam(selectParam) || {title:""};
 
-    return {title:informationData.title};
+    return {title:baseData.title};
 }
\ No newline at end of file

src/biz/systemTask.ts

@@ -8,7 +8,7 @@
  */
 
 import moment = require("moment");
-import { findTaskCountByKey, findTaskListByParam } from "../data/fuHuaQi/monthTask/task";
+import { findTaskCountByParamCount, findTaskListByParam } from "../data/fuHuaQi/monthTask/task";
 import * as taskTool from "../tools/taskTool";
 import { provideMonthTask, retrieveMonthTask } from "./mobileFuHuaQi/fuHuaQi/task/monthTask";
 import { findFuHuaQiList } from "../data/fuHuaQi/fuhuaqi";
@@ -61,7 +61,7 @@ export function initSystemTask() {
  */
 async function fuHuaQiMonthTask() {
     const Key = taskTool.getTimeKey();
-    let count = await findTaskCountByKey(Key);
+    let count = await findTaskCountByParamCount({key:Key});
     if (count != 0) return;
 
     /**生成新的任务 */

src/data/fuHuaQi/instituQualify/i18nRegister.ts

@@ -38,35 +38,76 @@ export async function save(throwError=false) {
     });
 }
 
+
+/**
+ * 根据id获取数据 可用save保存
+ * @param id 
+ * @returns 
+ */
 export async function findOneI18nRegister(id:string) {
     return await i18nRegisterModel.selectOnceData({id});
 }
 
+
+/**
+ * 获取符合条件列表
+ * @param param 
+ * @returns 
+ */
 export async function findI18nRegisterListByParam(param) {
     return await i18nRegisterModel.find(param);
 }
 
+
+/**
+ * 根据id删除
+ * @param id 
+ */
 export async function deleteI18nRegisterListById(id:string) {
     await i18nRegisterModel.deleteOne({id});   
 }
 
+
+/**
+ * 添加国际化登记
+ * @param id 
+ * @param uscc 
+ * @param name 
+ * @param country 
+ * @param partners 
+ * @param cMode 
+ * @param cAchievements 
+ */
 export async function addRegister(id:string, uscc:string, name:string, country:string, partners:string, cMode:string, cAchievements:string) {
     let addInfo = {id, uscc, name, country, partners, cMode, cAchievements};
     await i18nRegisterModel.create(addInfo);
 }
 
-export async function getCount(uscc:string) {
-    return await i18nRegisterModel.find({uscc}).countDocuments();
-}
-
+/**
+ * 分页
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findI18nRegisterListByParamToPage(param, skipCount:number) {
     return await i18nRegisterModel.find(param).skip(skipCount).limit(10);;
 }
 
+
+/**
+ * 获取符合条件的国际化登录数量
+ * @param param 
+ * @returns 
+ */
 export async function getI18nRegisterCountByParam(param) {
     return await i18nRegisterModel.find(param).countDocuments();
 }
 
+
+/**
+ * 去重拥有的国际化登录uscc
+ * @returns {"usccxxxx":1}
+ */
 export async function distinctFuHuaQiRegister() {
     let list = await i18nRegisterModel.distinct("uscc");
     let map = {};

src/data/fuHuaQi/instituQualify/icr.ts

@@ -39,31 +39,67 @@ export async function save(throwError=false) {
     });
 }
 
+
+/**
+ * 根据id获取大学/科研院所合作机构数据
+ * @param id 
+ * @returns 
+ */
 export async function findOneData(id:string) {
     return await icrModel.selectOnceData({id});
 }
 
+
+/**
+ * 根据条件获取大学/科研院所合作机构列表
+ * @param param 
+ * @returns 
+ */
 export async function findListDataByParam(param) {
     return await icrModel.find(param);
 }
 
+
+/**
+ * 根据id 删除 大学/科研院所合作机构 数据
+ * @param id 
+ */
 export async function deleteDataById(id:string) {
     await icrModel.deleteOne({id});   
 }
 
+
+/**
+ * 添加 大学/科研院所合作机构
+ * @param id 
+ * @param uscc 
+ * @param name 
+ * @param po 
+ * @param ce 
+ * @param cMode 
+ * @param startTimeMs 
+ */
 export async function addData(id:string, uscc:string, name:string, po:string, ce:string, cMode, startTimeMs:number) {
     let addInfo = {id, uscc, name, po, ce, cMode, startTimeMs};
     await icrModel.create(addInfo);
 }
 
-export async function getCount(uscc:string) {
-    return await icrModel.find({uscc}).countDocuments();
-}
-
+/**
+ * 分页获取 大学/科研院所合作机构
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findIcrListByParamToPage(param, skipCount:number) {
     return await icrModel.find(param).skip(skipCount).limit(10);;
 }
 
+
+/**
+ * 查看符合条件的大学/科研院所合作机构 数量
+ * @param param 
+ * @returns 
+ */
 export async function getIcrCountByParam(param) {
     return await icrModel.find(param).countDocuments();
 }
\ No newline at end of file

src/data/fuHuaQi/instituQualify/startupTeacher.ts

@@ -7,7 +7,6 @@ import {Schema} from 'mongoose';
 import { baseDB } from '../../../db/mongo/dbInit';
 
 
-
 const startupTeacherSchema = new Schema({
     id:{type:String, index:true},//标识
     uscc:{type:String, index:true},//孵化器uscc
@@ -41,31 +40,69 @@ export async function save(throwError=false) {
     });
 }
 
+/**
+ * 根据id查询
+ * @param id 
+ * @returns 
+ */
 export async function findOneData(id:string) {
     return await startupTeacherModel.selectOnceData({id});
 }
 
+
+/**
+ * 获取符合条件的列表
+ * @param param 
+ * @returns 
+ */
 export async function findListDataByParam(param) {
     return await startupTeacherModel.find(param);
 }
 
+
+/**
+ * 根据id删除
+ * @param id 
+ */
 export async function deleteDataById(id:string) {
     await startupTeacherModel.deleteOne({id});   
 }
 
+
+/**
+ * 添加数据
+ * @param id 
+ * @param uscc 
+ * @param name 
+ * @param teacherName 
+ * @param unit 
+ * @param duties 
+ * @param speciality 
+ * @param teacherLv 
+ * @param serviceEnterprises 
+ */
 export async function addData(id:string, uscc:string, name:string, teacherName:string, unit:string, duties:string, speciality, teacherLv:number, serviceEnterprises:string) {
     let addInfo = {id, uscc, name, teacherName, unit, duties, speciality, teacherLv, serviceEnterprises};
     await startupTeacherModel.create(addInfo);
 }
 
-export async function getCount(uscc:string) {
-    return await startupTeacherModel.find({uscc}).countDocuments();
-}
 
+/**
+ * 分页查询
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findStartupTeacherListByParamToPage(param, skipCount:number) {
     return await startupTeacherModel.find(param).skip(skipCount).limit(10);;
 }
 
+
+/**
+ * 获取符合条件的数量
+ * @param param 
+ * @returns 
+ */
 export async function getStartupTeacherCountByParam(param) {
     return await startupTeacherModel.find(param).countDocuments();
 }
\ No newline at end of file

src/data/fuHuaQi/instituQualify/zjBeyondLayout.ts

@@ -37,31 +37,66 @@ export async function save(throwError=false) {
 }
  
 
+/**
+ * 根据id获取数据
+ * @param id 
+ * @returns 
+ */
 export async function findOneData(id:string) {
     return await zjBeyondLayoutModel.selectOnceData({id});
 }
 
+
+/**
+ * 根据条件获取列表
+ * @param param 
+ * @returns 
+ */
 export async function findListDataByParam(param) {
     return await zjBeyondLayoutModel.find(param);
 }
 
+
+/**
+ * 根据id删除
+ * @param id 
+ */
 export async function deleteDataById(id:string) {
     await zjBeyondLayoutModel.deleteOne({id});   
 }
 
+
+/**
+ * 添加张江以外布局情况
+ * @param id 
+ * @param uscc 
+ * @param name 
+ * @param city 
+ * @param area 
+ * @param operationMode 
+ */
 export async function addData(id:string, uscc:string, name:string, city:string, area:number, operationMode:number) {
     let addInfo = {id, uscc, name, city, area, operationMode};
     await zjBeyondLayoutModel.create(addInfo);
 }
 
-export async function getCount(uscc:string) {
-    return await zjBeyondLayoutModel.find({uscc}).countDocuments();
-}
 
+/**
+ * 分页获取 张江以外布局情况
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findZjBeyondLayoutListByParamToPage(param, skipCount:number) {
     return await zjBeyondLayoutModel.find(param).skip(skipCount).limit(10);;
 }
 
+
+/**
+ * 获取符合条件的张江以外布局情况数据
+ * @param param 
+ * @returns 
+ */
 export async function getZjBeyondLayoutCountByParam(param) {
     return await zjBeyondLayoutModel.find(param).countDocuments();
 }
\ No newline at end of file

src/data/fuHuaQi/monthTask/monthTable.ts

@@ -43,6 +43,7 @@ export async function save(throwError=false) {
     });
 }
 
+
 /**
  * 通过taskId 获取此次任务添加的月度列表
  * @param taskId 任务id 格式遵循tool中getTaskId
@@ -119,17 +120,7 @@ export async function createMonthTableToList(tableList:object) {
 
 
 /**
- * 获取所有月度任务数据
- * @param selectParam 查询参数
- * @returns number 数据数量
- */
-export async function findMonthCount(selectParam) {
-    return await monthTableModel.find(selectParam).countDocuments();
-}
-
-
-/**
- * 
+ * 分组获取特定年月的已提交的出租率总合
 */
 export async function statsFuHuaQiMonthDataCount(year:number, month:number) {
     let statsList = await monthTableModel.aggregate([
@@ -140,6 +131,7 @@ export async function statsFuHuaQiMonthDataCount(year:number, month:number) {
     return statsList[0] ? statsList[0].count : 0;
 }
 
+
 /**
  * 获取某月填报的最低的出租率
  * @param year 

src/data/fuHuaQi/monthTask/task.ts

@@ -48,6 +48,7 @@ export async function save(throwError=false) {
     });
 }
 
+
 /**
  * 通过任务id 查询孵化器任务
  * @param taskId 任务id
@@ -74,14 +75,15 @@ export async function findEnterpriseByTaskIdAndType(taskId:string, type:number)
     return await fuHuaQiTaskModel.selectOnceData({taskId, type});
 }
 
-/**
- * 根据任务标识查询任务列表
- * @param key 任务标识
- * @returns 
- */
-export async function findTaskCountByKey(key:number) {
-    return await fuHuaQiTaskModel.find({key}).countDocuments();
-}
+
+// /**
+//  * 根据任务标识查询任务列表
+//  * @param key 任务标识
+//  * @returns 
+//  */
+// export async function findTaskCountByKey(key:number) {
+//     return await fuHuaQiTaskModel.find({key}).countDocuments();
+// }
 
 
 /**
@@ -92,6 +94,7 @@ export async function createTaskToList(taskList:object) {
     await fuHuaQiTaskModel.insertMany(taskList);
 }
 
+
 /**
  * 更具条件查询任务列表
  * @param param 
@@ -102,6 +105,7 @@ export async function findTaskListByParam(param) {
     return taskList;
 }
 
+
 /**
  * 将所有数据的年份加上 2023 
  * 2.0上线后去掉
@@ -111,6 +115,7 @@ export async function updateTaskYearData(year:number) {
     return await fuHuaQiTaskModel.updateMany({}, {$set:{year}});
 }
 
+
 /**
  * 根据条件分页查询任务列表
  * @param selectParam 查询条件
@@ -121,6 +126,7 @@ export async function findTaskListByParamAndPage(selectParam, skipCount:number)
     return await fuHuaQiTaskModel.find(selectParam).skip(skipCount).limit(10);
 }
 
+
 /**
  * 根据条件查询 任务数
  * @param selectParam 查询条件
@@ -130,11 +136,13 @@ export async function findTaskCountByParamCount(selectParam) {
     return await fuHuaQiTaskModel.find(selectParam).countDocuments();
 }
 
+
 /**数据维护 */
 export async function updateSubmitCount(taskId:string, type:number, count:number) {
     await fuHuaQiTaskModel.updateOne({type, taskId}, {$set:{submitCount:count}});
 }
 
+
 /**
  * 获取当个月的所有孵化器的填报率
  * @param year 

src/data/fuHuaQi/quarterTask/businessData.ts

@@ -56,35 +56,53 @@ export async function createBusinessToList(tableList:object) {
 }
 
 
+/**
+ * 根据任务id获取经营数据
+ * @param taskId 
+ * @returns 
+ */
 export async function findBusinessByTaskId(taskId:string) {
     return await fuHuaQiBusinessModel.selectOnceData({taskId});
 }
 
+
+/**
+ * 根据任务id和修改状态获取任务列表
+ * @param taskId 
+ * @param isUpdate 
+ * @returns 
+ */
 export async function findBusinessListByTaskIdAndUpdate(taskId:string, isUpdate:boolean) {
     return await fuHuaQiBusinessModel.find({taskId, isUpdate});
 }
 
-export async function findBusinessByTaskIdList(idList) {
-    let res = await fuHuaQiBusinessModel.find({taskId:{"$in":idList}});
-
-    let map = {};
-    res.forEach(info => {
-        map[info.taskId] = info;
-    });
-
-    return map;
-}
 
+/**
+ * 分页查询
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findBusinessDataByParamToPage(param, skipCount) {
     return await fuHuaQiBusinessModel.find(param).skip(skipCount).limit(10);
 }
 
 
+/**
+ * 分页获取总数
+ * @param param 
+ * @returns 
+ */
 export async function findBusinessDataCountByParam(param) {
     return await fuHuaQiBusinessModel.find(param).countDocuments();
 }
 
 
+/**
+ * 根据条件查询列表
+ * @param param 
+ * @returns 
+ */
 export async function findBusinessDataByParam(param) {
     return await fuHuaQiBusinessModel.find(param);
 }

src/data/fuHuaQi/quarterTask/quarterTask.ts

@@ -41,13 +41,32 @@ export async function save(throwError=false) {
 }
 
 
+/**
+ * 根据条件查询列表
+ * @param param 
+ * @returns 
+ */
 export async function findQuarterTaskByParam(param) {
     return await quarterTaskModel.find(param);
 }
+
+
+/**
+ * 根据id和type获取单个季度任务  可用save修改
+ * @param taskId 
+ * @param type 
+ * @returns 
+ */
 export async function findQuarterTaskByTaskIdAndType(taskId:string, type:number) {
     return await quarterTaskModel.selectOnceData({taskId, type});
 }
 
+
+/**
+ * 获取 taskId下的 各类任务
+ * @param taskId 
+ * @returns 返回 {"type":info }
+ */
 export async function findQuarterTaskMapTypeIsKeyByParam(taskId:string) {
     let result = await quarterTaskModel.find({taskId});
     let map = {};
@@ -58,10 +77,17 @@ export async function findQuarterTaskMapTypeIsKeyByParam(taskId:string) {
 }
 
 
+/**
+ * 获取符合条件的数据数
+ * @param param 
+ * @returns 
+ */
 export async function findQuarterTaskCountByParam(param) {
     return await quarterTaskModel.find(param).countDocuments();
 }
 
+
+
 /**
  * 创建季度任务
  * @param tableList 任务列表 
@@ -71,6 +97,12 @@ export async function createQuarterTaskToList(tableList:object) {
 }
 
 
+/**
+ * 分页
+ * @param param 
+ * @param skipCount 
+ * @returns 
+ */
 export async function findQuarterTaskByParamToPage(param, skipCount) {
     return await quarterTaskModel.find(param).skip(skipCount).limit(10);
 }

src/data/fuHuaQi/score.ts

@@ -43,6 +43,7 @@ export async function save(throwError=false) {
     });
 }
 
+
 /**
  * 查询孵化器分数信息
  * @param uscc 孵化器统一信用代码
@@ -67,6 +68,7 @@ export async function initFuHuaQiScore(array) {
     return await fuHuaQiScoreModel.insertMany(array);
 }
 
+
 /**通过条件查询孵化器得分信息 */
 export async function findScoreDataByParam(param) {
     return await fuHuaQiScoreModel.find(param);

src/tools/dataInit.ts

@@ -6,7 +6,7 @@ import { FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INDUSTRY, INSTITUTIONALNATURE } from
 import { createEnterpriseToList, findEnterpriseCount } from "../data/enterprise/enterprise";
 import { findFinancingCount } from "../data/fuHuaQi/monthTask/financing";
 import { createFuHuaQiToList, findAllFuHuaQiOperationUsccMap, findAllNotDisabledFuHuaQi, findFuHuaQiCount } from "../data/fuHuaQi/fuhuaqi";
-import { createMonthTableToList, findMonthCount } from "../data/fuHuaQi/monthTask/monthTable";
+import { createMonthTableToList, findMonthTableListCount } from "../data/fuHuaQi/monthTask/monthTable";
 import { getPwdMd5 } from "./system";
 import * as taskTool from "./taskTool";
 
@@ -248,7 +248,7 @@ async function initEnterprise() {
 }
 
 async function initMonth() {
-    let count =  await findMonthCount({});
+    let count =  await findMonthTableListCount({});
     if (count > 10) {
         console.log("*** 12月月度数据 无需初始化");
         return;