3.3.1归档

src/biz/mobileEnterprise/base/enterprise.ts

@@ -3,16 +3,20 @@
  * 作者：lxm
  */
 
+import moment = require("moment");
 import { EnterpriseUpdateBaseDataConfig } from "../../../config/eccParam/enterprise";
 import { INDUSTRY, STATEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { EnterpriseBaseConfig } from "../../../config/splitResultConfig";
 import * as enterpriseData from "../../../data/enterprise/enterprise";
+import { selectEnterpriseTwoYeasFinancing } from "../../../data/enterprise/financingInfo";
 import { findEnterpriseNewTeamData } from "../../../data/enterprise/quarterTask/team";
 import { BizError } from "../../../util/bizError";
 import { checkChange, checkDataHaveNull, extractData } from "../../../util/piecemeal";
 import { eccEnumValue } from "../../../util/verificationEnum";
 import { eccFormParam } from "../../../util/verificationParam";
+import { findBusinessDataByYear } from "../../../data/enterprise/quarterTask/businessdata";
+import { findReplenishBusinessDataByYear } from "../../../data/enterprise/replenish";
 
 
 /**
@@ -22,7 +26,7 @@ import { eccFormParam } from "../../../util/verificationParam";
  * @returns 
  */
 export async function getHomePageHeaderData(uscc:string) {
-    let enterpriseInfo = await enterpriseData.selectOneEnterpriseByParam({uscc});
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
 
     //企业名称
     let name = enterpriseInfo.name;
@@ -41,7 +45,31 @@ export async function getHomePageHeaderData(uscc:string) {
     let financing = !enterpriseInfo.tipsFinancingInfo; //融资情况缺失 true=缺失 需要标红
 
     let checkEnterpriseInfo = extractData(EnterpriseBaseConfig, enterpriseInfo, false);
-    let baseInfo = checkDataHaveNull(checkEnterpriseInfo, true)
+    let baseInfo = checkDataHaveNull(checkEnterpriseInfo, true);
+
+    /** 更新拟毕业情况  ps:拟毕业状态是不可逆的*/
+    if ( !enterpriseInfo.qualification ) {
+        let isGraduation = false;
+        let qualification = enterpriseInfo.qualification || {};
+        if (qualification.isHighTech || qualification.isZjtx || qualification.isBeOnTheMarket) {
+            isGraduation = true;
+        }
+        /*两年融资累计500万*/
+        let startYear = new Date(moment().subtract(2, 'year').year() + '-01-01 00:00:00').valueOf();
+        let endYear = new Date(moment().year() + '-01-01 00:00:00').valueOf();
+        let financingCount = await selectEnterpriseTwoYeasFinancing(uscc, startYear, endYear);
+        if (financingCount>=500) isGraduation = true;
+        /*两年营收累计1000万*/
+        let BICount = await findBusinessDataByYear(uscc, new Date(startYear).getFullYear(),  new Date(startYear).getFullYear()+1 );
+        let replenishBI = await findReplenishBusinessDataByYear(uscc, new Date(startYear).getFullYear(),  new Date(startYear).getFullYear()+1);
+        if (BICount + replenishBI >=10000000) isGraduation = true;
+
+        if (isGraduation) {
+            enterpriseInfo.graduation = true;
+            await enterpriseInfo.save();
+        }
+    }
+
 
     return {
         name,

src/biz/mobileEnterprise/quarterTask/dataDeclaration.ts

@@ -86,6 +86,10 @@ export async function todoList(uscc:string) {
         //todo 这里要放开
         // return {dataList:[], distanceEnd};
     }
+    //todo 这里10号之后要去掉
+    distanceEnd = `7月16日将停止填报本年度第一季数据`;
+    declarationYear = 2023;
+    declarationQuarter = 1;
 
     let businessDataInfo = await businessData.findNotSubmitBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     let teamsDataInfo = await teamData.findNotSubmitTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
@@ -169,8 +173,12 @@ export async function completedList(uscc:string, year:number, quarter:number) {
 export async function addBusinessData(uscc:string, BI:number, RD:number, TXP:number) {
     //todo  测试注释 后续要放开
     //if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
     
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (businessDataInfo.isSubmit || businessDataInfo.fhqIsSubmit) throw new BizError(ERRORENUM.请勿重复提交填报数据, `${uscc}已经提交了后点击创建企业经营数据`);
@@ -197,8 +205,11 @@ export async function addBusinessData(uscc:string, BI:number, RD:number, TXP:num
 export async function updateBusinessData(uscc:string, BI:number, RD:number, TXP:number) {
     //todo  测试注释 后续要放开
     // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (!businessDataInfo.isUpdate) throw new BizError(ERRORENUM.请先创建填报数据, `${uscc}修改经营数据前库里并没有创建数据`);
@@ -222,8 +233,12 @@ export async function updateBusinessData(uscc:string, BI:number, RD:number, TXP:
 export async function businessInfo(uscc:string) {
     //todo 测试注释 后续要放开
     // if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (!businessDataInfo || !businessDataInfo.year) throw new BizError(ERRORENUM.未提交填报数据, `${uscc}进行了违规操作`, '未提交数据就调用了回显接口');
@@ -246,9 +261,14 @@ export async function businessInfo(uscc:string) {
 export async function addTeamInfo(uscc:string, form) {
     //todo  测试注释 后续要放开
     // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+     // let {declarationQuarter, declarationYear} = getDeclarationTime();
     eccFormParam("企业申报团队信息数据", EnterpriseAddTeamDataConfig, form);
+   
+
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (teamInfo.isSubmit || teamInfo.fhqIsSubmit) throw new BizError(ERRORENUM.请勿重复提交填报数据, `${uscc}已经提交了后点击企业申报团队数据`);
@@ -279,8 +299,10 @@ export async function addTeamInfo(uscc:string, form) {
 export async function getTeamInfo(uscc:string) {
     //todo 测试注释 后续要放开
     // if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
-
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) throw new BizError(ERRORENUM.未提交填报数据, `${uscc}进行了违规操作`, '未提交数据就调用了回显接口');
@@ -296,8 +318,11 @@ export async function getTeamInfo(uscc:string) {
  * @param uscc 企业统一信用代码
  */
 export async function showTeamInfo(uscc:string) {
-
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo 测试注释 后续要放开
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 7-15日删除
+    let declarationQuarter = 1;
+    let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) {
@@ -322,9 +347,11 @@ export async function showTeamInfo(uscc:string) {
 export async function updateTeamInfo(uscc:string, form) {
     //todo  测试注释 后续要放开
     // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
     eccFormParam("企业修改团队信息数据", EnterpriseAddTeamDataConfig, form);
-
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
+   //todo  测试注释 7-15日删除
+   let declarationQuarter = 1;
+   let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo.isUpdate) throw new BizError(ERRORENUM.请先创建填报数据, `${uscc}修改团队信息数据前库里并没有创建数据`);
@@ -352,8 +379,12 @@ export async function submit(uscc:string, type:number) {
     eccEnumValue("企业提交数据申报", "type", ENTERPRISEDECLARATIONTYPE, type);
     //todo 测试注释 后续要放开
     // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-    
-    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+
+     //todo  测试注释 7-15日删除
+   let declarationQuarter = 1;
+   let declarationYear = 2023;
+
     let dataInfo;
     if (type == ENTERPRISEDECLARATIONTYPE.团队信息) {
         dataInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);

src/biz/mobileFuHuaQi/enterprise/myEnterprise.ts

@@ -33,7 +33,10 @@ export async function myEnterprise(uscc:string, state:number, name:string, page:
     if (name) selectParam.name = {"$regex":`${name}`};
     if (state == configEnum.INSIDESTATE.全部) {
         selectParam.state = {"$lt":4};
-    } else selectParam.state = state;
+    } else {
+        if (state == 5) selectParam.graduation = true;
+        else selectParam.state = state;
+    }
     
     let dataList = await enterpriseData.findEnterpriseListToPage(selectParam, (page-1)*10);
 
@@ -50,10 +53,15 @@ export async function myEnterprise(uscc:string, state:number, name:string, page:
         if (state == configEnum.FUHUASTATE.虚拟孵化) virtualCount = dataCount;
         else virtualCount = await enterpriseData.findEnterpriseCount({ fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.虚拟孵化 });
 
+
+        /**拟毕业企业数量 */
+        let graduate = await enterpriseData.findEnterpriseCount({ fuHuaQiUscc:uscc, graduation:true });
+
         result.dataNumberList = [
             {key:configEnum.INSIDESTATE.全部, value:`全部(${allCount})`},
             {key:configEnum.INSIDESTATE.实体孵化, value:`实体孵化(${allCount-virtualCount})`},
             {key:configEnum.INSIDESTATE.虚拟孵化, value:`虚拟孵化(${virtualCount})`},
+            {key:5, value:`拟毕业企业(${graduate})`}
         ];
 
     }
@@ -78,6 +86,7 @@ export async function myEnterprise(uscc:string, state:number, name:string, page:
 }
 
 
+
 /**
  * 修改企业孵化状态 修改为实体
  * 小程序端 2.0
@@ -265,13 +274,14 @@ export async function updateMyEnterpriseBaseInfo(fuHuaQiUscc:string, param) {
  * @param param 表单
  */
 export async function replenishMyEnterpriseInPutInfo(fuHuaQiUscc:string, param) {
+
     eccFormParam("补录新迁入企业信息", eccFormParamConfig.ReplenishMyEnterpriseInPutDataConfig, param );
     verificationEnumTools.eccEnumValue('补录新迁入企业信息', 'industry', configEnum.INDUSTRY, param.industry);
     if ( !sysTools.eccUscc(param.uscc) ) throw new BizError(ERRORENUM.统一社会信用代码不合法);
 
     /**不能出现重复的统一社会信用代码 草稿的也不行 */
     let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
-    if ( dataBaseInfo&& dataBaseInfo.uscc)  throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
+    if ( dataBaseInfo && dataBaseInfo.uscc && dataBaseInfo.state != configEnum.FUHUASTATE.迁出)  throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
 
     /**添加新注册企业标识 */
     param.isCreate = false;//标识此次操作是否是迁入企业并不是新注册企业

src/biz/mobileFuHuaQi/enterprise/toExamine.ts

@@ -44,7 +44,7 @@ export async function unauditedList(uscc:string) {
             isUpdate:isUpdate
         });
     });
-
+    
     let teamDataList = await findTeamDataByParams(query);
     teamDataList.forEach(info => {
         let { name, quarter, isSubmit, year, isUpdate } = info;

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

@@ -18,15 +18,15 @@ import moment = require("moment");
  * @param po 合作机构
  * @param ce 合作企业
  * @param cMode 合作方式
- * @param cAchievements 合作成果
+ * @param cAchievements 合作成果 3.3去除
  * @param startTimeMs 开始时间
  * @returns isSuccess 是否操作成功
  */
-export async function createIcr(uscc:string, po:string, ce:string, cMode, cAchievements:string, startTimeMs:number) {
+export async function createIcr(uscc:string, po:string, ce:string, cMode, startTimeMs:number) {
     let fuHuaQiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
 
     let id = getRandomId(uscc);
-    await icrData.addData(id, uscc, fuHuaQiInfo.name, po, ce, cMode, cAchievements, startTimeMs);
+    await icrData.addData(id, uscc, fuHuaQiInfo.name, po, ce, cMode, startTimeMs);
 
     return {isSuccess:true};
 }
@@ -39,17 +39,16 @@ export async function createIcr(uscc:string, po:string, ce:string, cMode, cAchie
  * @param po 合作机构
  * @param ce 合作企业
  * @param cMode 合作方式
- * @param cAchievements 合作成果
+ * @param cAchievements 合作成果 3.3去除
  * @param startTimeMs 开始时间
  * @returns isSuccess 是否操作成功
  */
-export async function updateIcr(uscc:string, id:string, po:string, ce:string, cMode, cAchievements:string, startTimeMs:number) {
+export async function updateIcr(uscc:string, id:string, po:string, ce:string, cMode, startTimeMs:number) {
     let dataInfo = await icrData.findOneData(id);
 
     dataInfo.po = po;
     dataInfo.ce = ce;
     dataInfo.cMode = cMode;
-    dataInfo.cAchievements = cAchievements;
     dataInfo.startTimeMs = startTimeMs;
 
     await dataInfo.save();
@@ -70,7 +69,6 @@ export async function selectIcr(id:string) {
         po:dataInfo.po,
         ce:dataInfo.ce,
         cMode:dataInfo.cMode,
-        cAchievements:dataInfo.cAchievements,
         startTimeMs:dataInfo.startTimeMs,
     };
 
@@ -105,7 +103,6 @@ export async function getIcrListData(uscc) {
             po:info.po,
             ce:info.ce,
             cMode:changeEnumValue(COOPERATIONMODE, info.cMode),
-            cAchievements:info.cAchievements,
             startTimeMs:moment(info.startTimeMs).format("YYYY/MM"),
         });
     });

src/biz/mobileFuHuaQi/fuHuaQi/remind.ts

@@ -3,6 +3,7 @@
  * 作者：lxm
  */
 
+import { TEAM } from "../../../config/enum";
 import { findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
 
 
@@ -19,7 +20,6 @@ export async function getDataImprovementList(uscc:string) {
         incubatedAcreage:"在孵面积",
         acreageTotal:"孵化器总面积",
         acreagePersonalUse:"孵化器自用面积",
-        hatchingGround:"经备案孵化场地",
     };
     for (let key in MyDataConfig) {
         if (key == "hatchingGround") {
@@ -34,22 +34,24 @@ export async function getDataImprovementList(uscc:string) {
         name:"名称",
         logonTime:"注册时间",
         lv:"孵化器级别",
-        identificationTime:"认定时间",
+        identificationTime:"孵化器认定时间",
         industry:"孵化领域",
         institutionalNature:"机构性质",
         operationModel:"运营模式",
-        foundingTeam:"创始团队",
         liaison:"联系人",
         liaisonPhone:"联系电话",
-        introduction:"孵化器"
+        introduction:"孵化器简介"
     };
     for (let key in MyInformationConfig) {
-        if (key == "industry" || key == "operationModel" || key == "foundingTeam" ) {
+        if (key == "industry" || key == "operationModel" ) {
             if (!fuhuaqiInfo[key] || !fuhuaqiInfo[key].length) myInformation.push(MyInformationConfig[key]);
         } else {
             if (!fuhuaqiInfo[key]) myInformation.push(MyInformationConfig[key]);
         }
     }
+    if (fuhuaqiInfo.foundingTeamType != TEAM.无) {
+        if (!fuhuaqiInfo.foundingTeam || !fuhuaqiInfo.foundingTeam.length) myInformation.push("孵化器创始团队");
+    }
 
     let title = "数据完善提醒";
 

src/config/splitResultConfig.ts

@@ -229,8 +229,8 @@ export const FuHuaQiBaseDataConfig = {
     // professionalTechnologyName:{key:"专业技术平台名称"},
     // professionalTechnologyCreateTime:{key:"专业技术平台时间"},
     // professionalTechnologyAmount:{key:"专业技术平台投资金额"},
-    isCooperation:{key:"是否与第三方机构合作"},
-    cooperationInstitutions:{key:"合作机构名称"},
+    // isCooperation:{key:"是否与第三方机构合作"},
+    // cooperationInstitutions:{key:"合作机构名称"},
     enterpriseTotal:{key:"累计企业"}
 }
 

src/data/enterprise/enterprise.ts

@@ -88,6 +88,8 @@ const enterpriseSchema = new Schema({
     tipsQualification:{type:Boolean, default:false},//标识-企业资质
     tipsIntellectualProperty:{type:Boolean, default:false},//标识-知识产权
     tipsFinancingInfo:{type:Boolean, default:false},//标识-企业融资
+    /**3.3增加 */
+    graduation:{type:Boolean, default:false},//拟毕业情况  
 
 });
 
@@ -188,7 +190,7 @@ export async function createEnterprise(fuHuaQiUscc:string, taskId:string, param)
  * @returns number  孵化器拥有的企业数量
  */
 export async function findEnterpriseCountByFuHuaQiUscc(fuHuaQiUscc:string) {
-    return await enterpriseModel.find({fuHuaQiUscc, state:{"$ne":4 }}).count();
+    return await enterpriseModel.find({fuHuaQiUscc, state:{"$ne":4 }}).countDocuments();
 }
 
 /**
@@ -197,7 +199,7 @@ export async function findEnterpriseCountByFuHuaQiUscc(fuHuaQiUscc:string) {
  * @returns number  孵化器拥有的企业数量
  */
 export async function findEnterpriseTotalByFuHuaQiUscc(fuHuaQiUscc:string) {
-    return await enterpriseModel.find({fuHuaQiUscc}).count();
+    return await enterpriseModel.find({fuHuaQiUscc}).countDocuments();
 }
 
 
@@ -253,7 +255,7 @@ export async function findEnterpriseList(selectParam) {
  * @returns number 数据数量
  */
  export async function findEnterpriseCount(selectParam) {
-    return await enterpriseModel.find(selectParam).count();
+    return await enterpriseModel.find(selectParam).countDocuments();
 }
 
 
@@ -318,3 +320,6 @@ export async function findStats() {
     return await enterpriseModel.find({enterpriseIsInPut:false});
 }
 
+export async function getHighTechEnterpriseByFuHuaQiUsccId(fuHuaQiUscc:string) {
+    return await enterpriseModel.find({"$and":[{"qualification.isHighTech":true}, {"qualification.isZjtx":true}, {fuHuaQiUscc}]});
+}
\ No newline at end of file

src/data/enterprise/financingInfo.ts

@@ -77,4 +77,22 @@ export async function selectFinancingListByParamsToPage(param, skipNumber) {
 
 export async function selectFinancingListByParams(param) {
     return await financingInfoModel.find(param);
+}
+
+/**
+ * 获取两年内的融资金额
+ */
+export async function selectEnterpriseTwoYeasFinancing(uscc:string, startTime:number, endTime:number) {
+    let param = { uscc, timeToObtainInvestment:{"$gt":startTime, "$lt":endTime } };
+    let data = await financingInfoModel.find(param);
+    let distinctMap = {};
+    data.forEach(info => {
+        let { timeToObtainInvestment, investmentInstitutionsName } = info;
+        
+    });
+
+    let count = 0;
+    Object.values(distinctMap).forEach((num:number) => {count += num});
+
+    return count;
 }
\ No newline at end of file

src/data/enterprise/quarterTask/businessdata.ts

@@ -89,5 +89,15 @@ export async function addManyBusinessData(addList) {
  * @returns 
  */
 export async function findBusinessDataCountByTime(year:number, quarter:number) {
-    return await businessDataModel.find({year, quarter}).count();
+    return await businessDataModel.find({year, quarter}).countDocuments();
+}
+export async function findBusinessDataByYear(uscc:string, startYear:number, endYear:number) {
+    let dataList = await businessDataModel.find({"$or":[{year:startYear}, {year:endYear}], uscc});
+    let count = 0;
+    dataList.forEach(info => {
+        let {BI} = info;
+        if (BI) count += BI;
+    });
+
+    return count;
 }
\ No newline at end of file

src/data/enterprise/quarterTask/team.ts

@@ -65,7 +65,7 @@ export async function findTeamByUsccAndTime(uscc:string, year:number, quarter:nu
  * @returns 
  */
 export async function findTeamDataCountByTime(year:number, quarter:number) {
-    return await teamModel.find({year, quarter}).count();
+    return await teamModel.find({year, quarter}).countDocuments();
 }
 
 export async function findNotSubmitTeamByUsccAndTime(uscc:string, year:number, quarter:number) {

src/data/enterprise/replenish.ts

@@ -4,6 +4,7 @@
 
 import {Schema} from 'mongoose';
 import { baseDB } from '../../db/mongo/dbInit';
+import { BUSINESSDATATYPE } from '../../config/enum';
 
 const replenishSchema = new Schema({
     year:{type:Number, index:true},//年度
@@ -55,4 +56,15 @@ export async function selectRepleishData(uscc:string, year:number) {
 
 export async function findRepleishDataByTypeAndYear(uscc:string, type:number, year:number) {
     return await replenishDataModel.find({uscc, type, year});
+}
+
+export async function findReplenishBusinessDataByYear(uscc:string, startYear:number, endYear:number) {
+    let dataList = await replenishDataModel.find({"$or":[{year:startYear}, {year:endYear}], uscc, type:BUSINESSDATATYPE.营业收入});
+    let count = 0;
+    dataList.forEach(info => {
+        let {value} = info;
+        if (value) count += value;
+    });
+
+    return count;
 }
\ No newline at end of file

src/data/fuHuaQi/fuhuaqi.ts

@@ -157,7 +157,7 @@ export async function findFuHuaQiList(selectParam) {
  * @returns number 数据数量
  */
 export async function findFuHuaQiCount(selectParam) {
-    return await fuHuaQiModel.find(selectParam).count();
+    return await fuHuaQiModel.find(selectParam).countDocuments();
 }
 
 
@@ -219,7 +219,7 @@ export async function findAllFuHuaQiOperationUsccMap() {
  * @returns number 数据数量
  */
  export async function findFuHuaQiUserCount(selectParam) {
-    return await fuHuaQiModel.find(selectParam).count();
+    return await fuHuaQiModel.find(selectParam).countDocuments();
 }
 
 

src/data/fuHuaQi/instituQualify/i18nRegister.ts

@@ -56,7 +56,7 @@ export async function addRegister(id:string, uscc:string, name:string, country:s
 }
 
 export async function getCount(uscc:string) {
-    return await i18nRegisterModel.find({uscc}).count();
+    return await i18nRegisterModel.find({uscc}).countDocuments();
 }
 
 export async function findI18nRegisterListByParamToPage(param, skipCount:number) {
@@ -64,7 +64,7 @@ export async function findI18nRegisterListByParamToPage(param, skipCount:number)
 }
 
 export async function getI18nRegisterCountByParam(param) {
-    return await i18nRegisterModel.find(param).count();
+    return await i18nRegisterModel.find(param).countDocuments();
 }
 
 export async function distinctFuHuaQiRegister() {

src/data/fuHuaQi/instituQualify/icr.ts

@@ -51,11 +51,11 @@ export async function deleteDataById(id:string) {
     await icrModel.deleteOne({id});   
 }
 
-export async function addData(id:string, uscc:string, name:string, po:string, ce:string, cMode, cAchievements:string, startTimeMs:number) {
-    let addInfo = {id, uscc, name, po, ce, cMode, cAchievements, 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}).count();
+    return await icrModel.find({uscc}).countDocuments();
 }

src/data/fuHuaQi/instituQualify/startupTeacher.ts

@@ -59,5 +59,5 @@ export async function addData(id:string, uscc:string, name:string, teacherName:s
 }
 
 export async function getCount(uscc:string) {
-    return await startupTeacherModel.find({uscc}).count();
+    return await startupTeacherModel.find({uscc}).countDocuments();
 }

src/data/fuHuaQi/instituQualify/zjBeyondLayout.ts

@@ -55,5 +55,5 @@ export async function addData(id:string, uscc:string, name:string, city:string,
 }
 
 export async function getCount(uscc:string) {
-    return await zjBeyondLayoutModel.find({uscc}).count();
+    return await zjBeyondLayoutModel.find({uscc}).countDocuments();
 }

src/data/fuHuaQi/monthTask/financing.ts

@@ -122,7 +122,7 @@ export async function deleteEnterpriseFinancing(uscc:string, taskId:string) {
  * @returns number 数据数量
  */
  export async function findFinancingCount(selectParam:object) {
-    return await financingModel.find(selectParam).count();
+    return await financingModel.find(selectParam).countDocuments();
 }
 
 /**

src/data/fuHuaQi/monthTask/monthTable.ts

@@ -104,7 +104,7 @@ export async function findMonthTableList(selectParam:object) {
  * @returns count 数据量
  */
 export async function findMonthTableListCount(selectParam:object) {
-    return await monthTableModel.find(selectParam).count();
+    return await monthTableModel.find(selectParam).countDocuments();
 }
 
 
@@ -123,5 +123,5 @@ export async function createMonthTableToList(tableList:object) {
  * @returns number 数据数量
  */
 export async function findMonthCount(selectParam) {
-    return await monthTableModel.find(selectParam).count();
+    return await monthTableModel.find(selectParam).countDocuments();
 }

src/data/fuHuaQi/monthTask/task.ts

@@ -80,7 +80,7 @@ export async function findEnterpriseByTaskIdAndType(taskId:string, type:number)
  * @returns 
  */
 export async function findTaskCountByKey(key:number) {
-    return await fuHuaQiTaskModel.find({key}).count();
+    return await fuHuaQiTaskModel.find({key}).countDocuments();
 }
 
 
@@ -127,7 +127,7 @@ export async function findTaskListByParamAndPage(selectParam, skipCount:number)
  * @returns 
  */
 export async function findTaskCountByParamCount(selectParam) {
-    return await fuHuaQiTaskModel.find(selectParam).count();
+    return await fuHuaQiTaskModel.find(selectParam).countDocuments();
 }
 
 /**数据维护 */

src/data/fuHuaQi/quarterTask/businessData.ts

@@ -81,7 +81,7 @@ export async function findBusinessDataByParamToPage(param, skipCount) {
 
 
 export async function findBusinessDataCountByParam(param) {
-    return await fuHuaQiBusinessModel.find(param).count();
+    return await fuHuaQiBusinessModel.find(param).countDocuments();
 }
 
 

src/data/fuHuaQi/quarterTask/quarterTask.ts

@@ -59,7 +59,7 @@ export async function findQuarterTaskMapTypeIsKeyByParam(taskId:string) {
 
 
 export async function findQuarterTaskCountByParam(param) {
-    return await quarterTaskModel.find(param).count();
+    return await quarterTaskModel.find(param).countDocuments();
 }
 
 /**

src/data/guanWeiHui/information.ts

@@ -73,7 +73,7 @@ export async function selectInformationByParamToPage(param, skipNumber:number) {
 }
 
 export async function selectInformationByParamCount(param) {
-    return await informationModel.find(param).count();;
+    return await informationModel.find(param).countDocuments();;
 }
 
 export async function selectOnceInformationByParamToParam(param) {

src/routers/mobileClient/institutionalNature.ts

@@ -200,11 +200,11 @@ async function updateProfessionalTechnology(req, res) {
  * @param res 
  */
 async function addICR(req, res) {
-    let reqConf = {po:"String", ce:"String", cMode:"[Number]", cAchievements:"String", startTimeMs:"Number"};
-    let { po, ce, cMode, cAchievements, startTimeMs } = eccReqParamater(reqConf, req.body);
+    let reqConf = {po:"String", ce:"String", cMode:"[Number]", startTimeMs:"Number"};
+    let { po, ce, cMode, startTimeMs } = eccReqParamater(reqConf, req.body);
     const Uscc = req.headers.uscc;
 
-    let result = await icrBiz.createIcr(Uscc, po, ce, cMode, cAchievements, startTimeMs);
+    let result = await icrBiz.createIcr(Uscc, po, ce, cMode, startTimeMs);
 
     res.success(result);
 
@@ -216,11 +216,11 @@ async function addICR(req, res) {
  * @param res 
  */
 async function updateICR(req, res) {
-    let reqConf = {id:"String", po:"String", ce:"String", cMode:"[Number]", cAchievements:"String", startTimeMs:"Number"};
-    let {id, po, ce, cMode, cAchievements, startTimeMs } = eccReqParamater(reqConf, req.body);
+    let reqConf = {id:"String", po:"String", ce:"String", cMode:"[Number]", startTimeMs:"Number"};
+    let {id, po, ce, cMode, startTimeMs } = eccReqParamater(reqConf, req.body);
     const Uscc = req.headers.uscc;
 
-    let result = await icrBiz.updateIcr(Uscc, id, po, ce, cMode, cAchievements, startTimeMs);
+    let result = await icrBiz.updateIcr(Uscc, id, po, ce, cMode, startTimeMs);
 
     res.success(result);
 
@@ -235,7 +235,7 @@ async function icrInfo(req, res) {
     let reqConf = {id: 'String' };//这里可以填0
     let { id } = eccReqParamater(reqConf, req.body);
     let result = await icrBiz.selectIcr(id);
-
+    
     res.success(result);
 
 }