bug修复

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

@@ -73,7 +73,7 @@ export async function fuHuaQiBaseData(uscc:string) {
         if (fuHuaQiInfo[key] == undefined) notCount += 1;
     });
 
-    const ScoreData = { score:count, star:newStar, infoIntegrity:Math.ceil((notCount/keyList.length)*10000)/100 };
+    const ScoreData = { score:count, star:newStar, infoIntegrity:Math.ceil(((keyList.length-notCount)/keyList.length)*10000)/100 };
 
     const PTPData = !fuHuaQiInfo.isCreatePTP ? {} : {
         scalePTP: fuHuaQiInfo.scalePTP,//基金规模

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

@@ -59,11 +59,11 @@ export async function fuHuaQiOperateStats(uscc:string, year:number) {
     };
     businessDbList.forEach(info => { 
         let {TR, ROR, RR, FS, MIS } = info;
-        if ( TR ) businessMap["TR"].count += TR;
-        if ( ROR ) businessMap["ROR"].count += ROR;
-        if ( RR ) businessMap["RR"].count += RR;
-        if ( FS ) businessMap["FS"].count += FS;
-        if ( MIS ) businessMap["MIS"].count += MIS;
+        if ( TR ) businessMap["TR"].count = Math.ceil((TR + businessMap["TR"].count) * 100 )/100;
+        if ( ROR ) businessMap["ROR"].count = Math.ceil((ROR + businessMap["ROR"].count) * 100 )/100;
+        if ( RR ) businessMap["RR"].count = Math.ceil((RR + businessMap["RR"].count) * 100 )/100;
+        if ( FS ) businessMap["FS"].count = Math.ceil((FS + businessMap["FS"].count) * 100 )/100;
+        if ( MIS ) businessMap["MIS"].count = Math.ceil((MIS + businessMap["MIS"].count) * 100 )/100;
     });
     let businessList = Object.values(businessMap);
 
@@ -72,21 +72,31 @@ export async function fuHuaQiOperateStats(uscc:string, year:number) {
 
 
 /**
- * 孵化器拥有企业数量趋势
+ * 在孵企业数量趋势
  * @param uscc 
  */
 async function getFuHuaQiOwnEnterpriseCountStats(uscc:string, year:number) {
-    let dataStartMs = new Date(moment().subtract(6, 'months').format("YYYY-MM")+"-01 00:00:00").valueOf();
+    let dataStartMs = new Date().valueOf();
+    let dataEndMs = new Date().valueOf();
+    if (year!= new Date().getFullYear()) {
+        dataStartMs = new Date(year+"-01-01 00:00:00").valueOf();
+        dataEndMs = new Date((year+1)+"-01-01 00:00:00").valueOf();
+    } else {
+        dataStartMs = new Date(moment().subtract(12, 'months').format("YYYY-MM")+"-01 00:00:00").valueOf();
+    }
+    
     let param = {
         uid:uscc,
-        ct:{"$gt":dataStartMs},
-    };
+        ct:{"$gt":dataStartMs, "$lt":dataEndMs},
+    }; 
+
     let pointDataList = await getPointDataByParam(POINTTYPEENUM.孵化器, FUHUAQINODEENUM.企业状态变化, param);
 
     let distinctMap = {}; //{ month:{ct:xxx, pointInfo:{} } }
-    for (let i = 1; i <= 6; i++) {
-        let key = moment().subtract(i, 'months').format("YYYY-MM");
-        distinctMap[key]={ct:0,pointInfo:{}};
+    for (let i = 1; i <= 12; i++) {
+        let key = i;
+        let defCt = new Date(`${year}-${i}-1 00:00:00`).valueOf();
+        distinctMap[key]={ct:defCt,pointInfo:{}};
     }
     
 
@@ -94,7 +104,7 @@ async function getFuHuaQiOwnEnterpriseCountStats(uscc:string, year:number) {
     pointDataList.forEach(info => {
         let {p1, ct } = info;
         let pointInfo = JSON.parse(p1);
-        let dataMonth = moment(ct).format("YYYY-MM");
+        let dataMonth = moment(ct).month() + 1;
 
         if (!distinctMap[dataMonth])  console.log("数据异常 不符合范围之内的值 检查点1003");
         else if(distinctMap[dataMonth].ct < ct) distinctMap[dataMonth] = {ct, pointInfo};
@@ -113,7 +123,7 @@ async function getFuHuaQiOwnEnterpriseCountStats(uscc:string, year:number) {
     let monthData = [];
     dataList.forEach(info => {
         let {month, xn, st} = info;
-        monthData.push(`${month}月`);
+        monthData.push(month);
         xnData.push(xn);
         stData.push(st);
     });
@@ -130,16 +140,24 @@ async function getFuHuaQiOwnEnterpriseCountStats(uscc:string, year:number) {
  * @returns 
  */
 async function getFuHuaQiOwnEnterpriseGraduateCountStats(uscc:string, year:number) {
-    let dataStartMs = new Date(moment().subtract(6, 'months').format("YYYY-MM")+"-01 00:00:00").valueOf();
+    let dataStartMs = new Date().valueOf();
+    let dataEndMs = new Date().valueOf();
+    if (year!= new Date().getFullYear()) {
+        dataStartMs = new Date(year+"-01-01 00:00:00").valueOf();
+        dataEndMs = new Date((year+1)+"-01-01 00:00:00").valueOf();
+    } else {
+        dataStartMs = new Date(moment().subtract(12, 'months').format("YYYY-MM")+"-01 00:00:00").valueOf();
+    }
+
     let param = {
         uid:uscc,
-        ct:{"$gt":dataStartMs},
+        ct:{"$gt":dataStartMs, "$lt":dataEndMs},
     };
     let pointDataList = await getPointDataByParam(POINTTYPEENUM.孵化器, FUHUAQINODEENUM.我的企业_孵化状态, param);
 
     let monthDataMap = {};
-    for (let i = 1; i <= 6; i++) {
-        let key = moment().subtract(i, 'months').format("YYYY-MM");
+    for (let i = 1; i <= 12; i++) {
+        let key = i;
         monthDataMap[key]={ct:0, month:key, count:0, graduation:0};
     }
     
@@ -147,7 +165,7 @@ async function getFuHuaQiOwnEnterpriseGraduateCountStats(uscc:string, year:numbe
         let { p2, ct } = info;
         let { state, moveOutType, graduation } = JSON.parse(p2);
 
-        let dataMonth = moment(ct).format("YYYY-MM");
+        let dataMonth = moment(ct).month()+1;
         if (state == FUHUASTATE.迁出 && moveOutType == MOVEOUTTYPE.毕业迁出) {
             if (!monthDataMap[dataMonth]) {
                 console.log("数据异常 不符合范围之内的值 检查点1002");

src/biz/mobileEnterprise/base/enterprise.ts

@@ -43,7 +43,7 @@ export async function getHomePageHeaderData(uscc:string) {
     
     let qualification = !enterpriseInfo.tipsQualification; //企业资质缺失 true=缺失 需要标红
     let intellectualProperty = !enterpriseInfo.tipsIntellectualProperty;//知识产权缺失 true=缺失 需要标红
-    let financing = !enterpriseInfo.tipsFinancingInfo; //融资情况缺失 true=缺失 需要标红
+    let financing = !enterpriseInfo.tipsFinancingInfo; //融资情况缺失 true=缺失 需要标红 
 
     let checkEnterpriseInfo = extractData(EnterpriseBaseConfig, enterpriseInfo, false);
     let baseInfo = checkDataHaveNull(checkEnterpriseInfo, true);

src/biz/mobileEnterprise/base/intellectualProperty.ts

@@ -47,13 +47,14 @@ export async function updateIntellectualProperty(uscc:string, alienPatent:number
     }
 
     enterpriseInfo.intellectualProperty = {alienPatent, classIPatent, secondClassPatent};
-    await enterpriseInfo.save();
     
     /**红框提示 */
     if (!enterpriseInfo.tipsIntellectualProperty ) {
         enterpriseInfo.tipsIntellectualProperty = true;
     }
 
+    await enterpriseInfo.save();
+
     return {isSuccess:true}
 }