优化事件标签，拆开标签枚举

src/biz/admin/enterprise/enterpriseLabel.ts

@@ -4,13 +4,13 @@
  * 
  */
 
-import { ENTERPRISESYSTEMLABEL, LABELGOAL, LABELTYPE, LABELUPDATEROAD } from "../../../config/enum";
 import { findEnterpriseByUscc, findEnterpriseCount, findEnterpriseListToPage } from "../../../data/enterprise/enterprise";
 import { findLabelLogByParam } from "../../../data/enterprise/enterpriseLabelLog";
 import { getEffectiveLabelMap, selectLabelList } from "../../../data/label";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import moment = require("moment");
 import { updateLabelToEnterprise } from "../../label";
+import { ENTERPRISESYSTEMLABEL, LABELGOAL, LABELTYPE, LABELUPDATEROAD } from "../../../config/enum/labelEnum";
 
 
 /**

src/biz/admin/fuHuaQi/fuHuaQiLabel.ts

@@ -3,12 +3,12 @@
  * 6.0功能
  */
 import moment = require("moment");
-import { FHQSYSTEMLABEL, LABELGOAL, LABELTYPE, LABELUPDATEROAD } from "../../../config/enum";
 import { findLabelLogByParam } from "../../../data/fuHuaQi/fuHuaQiLabelLog";
 import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiListByPage } from "../../../data/fuHuaQi/fuhuaqi";
 import { getEffectiveLabelMap } from "../../../data/label";
 import { changeEnumValue } from "../../../util/verificationEnum";
 import { updateLabelToFuHuaQi } from "../../label";
+import { LABELGOAL, LABELTYPE, LABELUPDATEROAD, FHQSYSTEMLABEL } from "../../../config/enum/labelEnum";
 
 
 /**

src/biz/admin/labelMGT.ts

@@ -3,7 +3,7 @@
  * 6.0功能
  */
 
-import { LABELGOAL, LABELTYPE } from "../../config/enum";
+import { LABELGOAL, LABELTYPE } from "../../config/enum/labelEnum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { createLabel, findOnceLabel, selectLabelCount, selectLabelListToPage } from "../../data/label";
 import { getLabelId } from "../../tools/system";

src/biz/label.ts

 /**
  * 标签系统 主要逻辑
  */
-import { ENTERPRISESYSTEMLABEL,  FHQSYSTEMLABEL,  FUHUASTATE, INDUSTRY, LABELGOAL, LABELTYPE, LABELUPDATEROAD,  MOVEOUTTYPE, STATEENUM } from "../config/enum";
+import { FUHUASTATE, INDUSTRY,  MOVEOUTTYPE, STATEENUM } from "../config/enum";
 import { findEnterpriseByUscc, findUsccList } from "../data/enterprise/enterprise";
 import * as fuHuaQiLabelLogData from "../data/fuHuaQi/fuHuaQiLabelLog";
 import * as enterpriseLabelLogData from "../data/enterprise/enterpriseLabelLog";
@@ -12,6 +12,7 @@ import { addSystemLabel, findOnceLabel } from "../data/label";
 import { changeAddToString, getLabelId } from "../tools/system";
 import { addressIsInZJ } from "../tools/transCode";
 import moment = require("moment");
+import { ENTERPRISESYSTEMLABEL, LABELEVENT, LABELGOAL, LABELTYPE, LABELUPDATEROAD, FHQSYSTEMLABEL } from "../config/enum/labelEnum";
 
 /**企业标签操作 */
 
@@ -407,58 +408,46 @@ export async function initSystemLabelData() {
     addSystemLabel(systemLabelList);
 }
 
-
 /**
- * 企业事件标签
- * 事件标签都是系统标签
- * 传入的企业对象必须是修改后为保存的
+ * 企业事件标签，事件触标签
+ * 需要注意，传入的企业对象必须是必要条件修改之后的对象
  * @param enterpriseInfo 
- * @param labelId 
+ * @param labelEventPoint 
+ * @param p1 
  */
-export function enterpriseEventLabel(enterpriseInfo, labelId, p1?, p2?, p3?) {
-    switch (labelId) {
-        case ENTERPRISESYSTEMLABEL.在孵企业:
-            // /**在孵企业 */todo
-            // 进来之后需要去除其他的标签 改成在孵标签
-        break;
-        case ENTERPRISESYSTEMLABEL.上市企业: 
-            if (enterpriseInfo.qualification && enterpriseInfo.qualification.isBeOnTheMarket) {
-                inLabelToEnterprise(enterpriseInfo, labelId, p1);
+export async function enterpriseLabelEvent(enterpriseInfo, labelEventPoint, p1?, p2?) {
+    switch (labelEventPoint) {
+        case LABELEVENT.入孵:
+            /**入孵企业判断是不是在孵化企业标签 并且将其他标签失效*/
+            /**p1 = 传入孵化器名称 */
+            let isZfqy= false;
+            let logonAddressStr = changeAddToString(enterpriseInfo.logonAddress);
+            if (logonAddressStr && enterpriseInfo.state == FUHUASTATE.实体孵化 && enterpriseInfo.logonTime && enterpriseInfo.industry) {
+                let yearLong = moment().diff(enterpriseInfo.logonTime, 'years');
+                if ([INDUSTRY.人工智能及智能制造, INDUSTRY.生物医药, INDUSTRY.集成电路].every(e => enterpriseInfo.industry.includes(e))) {
+                    if (yearLong < 5) isZfqy = true;
+                    else isZfqy = true;
                 } else {
-                outLabelToEnterprise(enterpriseInfo, labelId);
+                    if (yearLong < 4) isZfqy = true;
+                    else isZfqy = true;
                 }
-        break;
-        case ENTERPRISESYSTEMLABEL.专精特新: 
-            if (enterpriseInfo.qualification && enterpriseInfo.qualification.isZjtx) {
-                inLabelToEnterprise(enterpriseInfo, labelId, p1);
-            } else {
-                outLabelToEnterprise(enterpriseInfo, labelId);
+                isZfqy = await addressIsInZJ(logonAddressStr);
             }
-        break;
-        case ENTERPRISESYSTEMLABEL.小巨人: 
-            if (enterpriseInfo.qualification && enterpriseInfo.qualification.xjrMs) {
-                inLabelToEnterprise(enterpriseInfo, labelId, p1);
-            } else {
-                outLabelToEnterprise(enterpriseInfo, labelId);
-            }
-        break;
-        case ENTERPRISESYSTEMLABEL.高新企业: 
-            if (enterpriseInfo.qualification && enterpriseInfo.qualification.isHighTech) {
-                inLabelToEnterprise(enterpriseInfo, labelId, p1);
-            } else {
-                outLabelToEnterprise(enterpriseInfo, labelId);
+            if (isZfqy) {
+                inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.在孵企业, p1);
             }
-        break;
-        case ENTERPRISESYSTEMLABEL.虚拟企业:
-            if (enterpriseInfo.state == FUHUASTATE.虚拟孵化) {
-                inLabelToEnterprise(enterpriseInfo, labelId, p1);
-            } else {
-                outLabelToEnterprise(enterpriseInfo, labelId);
+            //如果存在迁出相关标签
+            if (enterpriseInfo.labels) {
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.企业注销);
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业);
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.毕业企业);
+                //兼容老数据  虚拟企业变成=>实体孵化  这个if理论上不会执行
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.虚拟企业);
             }
         break;
-        case ENTERPRISESYSTEMLABEL.企业注销:
-        case ENTERPRISESYSTEMLABEL.毕业企业:
-        case ENTERPRISESYSTEMLABEL.迁出企业: 
+        case LABELEVENT.迁出:
+            /**迁出企业需要 置灰在孵企业标签 拟毕业等 */
+            /**p1 = 传入孵化器名称 */
             if (enterpriseInfo.state == FUHUASTATE.迁出) {
                 if (enterpriseInfo.moveOutType == MOVEOUTTYPE.企业注销) {
                     inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.企业注销);
@@ -470,17 +459,73 @@ export function enterpriseEventLabel(enterpriseInfo, labelId, p1?, p2?, p3?) {
                     }
                     inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业, outStr);
                 }
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.在孵企业);
+            }
+        break;
+        case LABELEVENT.融资:
+            /**p1 = 融资轮次， p2 = 融资金额*/
+            inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.融资企业, `获得${p1}融资，${p2}万元`);
+        break;
+        case LABELEVENT.资质更新:
+            /** 更新企业资质标签 触发拟毕业 */
+            /**p1 = '企业登记' */
+            p1 = p1 || '';
+            if (enterpriseInfo.qualification) {
+                if (enterpriseInfo.qualification.isBeOnTheMarket) {
+                    inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.上市企业, p1);
+                } else {
+                    outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.上市企业);
+                }
+
+                if (enterpriseInfo.qualification.isZjtx) {
+                    inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.专精特新, p1);
+                } else {
+                    outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.专精特新);
+                }
+
+                if (enterpriseInfo.qualification.xjrMs) {
+                    inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.小巨人, p1);
+                } else {
+                    outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.小巨人);
+                }
+
+                if (enterpriseInfo.qualification.isHighTech) {
+                    inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.高新企业, p1);
+                } else {
+                    outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.高新企业);
+                }
+
+
+            }
+           
+        break;
+        case LABELEVENT.孵化类型更新:
+            /**实体->虚拟 需要将入孵企业标签失效 */
+            /**p1 = 孵化器名称 */
+            if (enterpriseInfo.state == FUHUASTATE.虚拟孵化) {
+                inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.虚拟企业, p1);
+            } else {
+                outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.虚拟企业);
+                let isZfqy= false;
+                let logonAddressStr = changeAddToString(enterpriseInfo.logonAddress);
+                if (logonAddressStr && enterpriseInfo.state == FUHUASTATE.实体孵化 && enterpriseInfo.logonTime && enterpriseInfo.industry) {
+                    let yearLong = moment().diff(enterpriseInfo.logonTime, 'years');
+                    if ([INDUSTRY.人工智能及智能制造, INDUSTRY.生物医药, INDUSTRY.集成电路].every(e => enterpriseInfo.industry.includes(e))) {
+                        if (yearLong < 5) isZfqy = true;
+                        else isZfqy = true;
                     } else {
-                //迁出企业被重新迁入 需要将迁出企业相关标签全部去掉
-                //outLabelToEnterprise 方法不会主动添加失效标签，所以可以直接使用
+                        if (yearLong < 4) isZfqy = true;
+                        else isZfqy = true;
+                    }
+                    isZfqy = await addressIsInZJ(logonAddressStr);
+                }
+                if (isZfqy) {
+                    inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.在孵企业, p1);
+                }
                 outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.企业注销);
                 outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业);
                 outLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.毕业企业);
             }
-
-        break;
-        case ENTERPRISESYSTEMLABEL.融资企业:
-            inLabelToEnterprise(enterpriseInfo, ENTERPRISESYSTEMLABEL.融资企业, p1);
         break;
     }
 }

src/biz/mobileEnterprise/base/qualification.ts

@@ -4,7 +4,7 @@
  */
 
 import { EnterpriseQualificationUpdateConfig } from "../../../config//eccParam/enterprise";
-import { ENTERPRISESYSTEMLABEL, LISTINGSITUATION } from "../../../config/enum";
+import { LISTINGSITUATION } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { BizError } from "../../../util/bizError";
 import { eccEnumValue } from "../../../util/verificationEnum";
@@ -12,7 +12,8 @@ import { eccFormParam } from "../../../util/verificationParam";
 import * as enterpriseData from "../../../data/enterprise/enterprise";
 import { addEnterprisePoint } from "../../point";
 import { ENTERPRISENODEENUM } from "../../../config/pointConfig";
-import { enterpriseEventLabel } from "../../label";
+import { enterpriseLabelEvent } from "../../label";
+import { LABELEVENT } from "../../../config/enum/labelEnum";
 
 
 
@@ -88,18 +89,7 @@ export async function updateQualification(uscc:string, param) {
     enterpriseInfo.qualification = JSON.parse(JSON.stringify(param) );
 
     /**标签 */
-    if (oldMarketData.isBeOnTheMarket != newMarketData.isBeOnTheMarket) {
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.上市企业, '企业登记' );
-    }
-    if (oldIsZjtxData.isZjtx != newIsZjtxData.isZjtx) {
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.专精特新, '企业登记');
-    }
-    if (oldIsXjrData.isXjr != newIsXjrData.isXjr) {
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.小巨人, '企业登记');
-    }
-    if (oldHighTechData.isHighTech != newHighTechData.isHighTech) {
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.高新企业, '企业登记');
-    }
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.资质更新, '企业登记');
 
     /**修改了之后去掉 红框提示 */
     if (!enterpriseInfo.tipsQualification ) {

src/biz/mobileEnterprise/financing.ts

@@ -4,7 +4,8 @@
  */
 
 import * as eccFormParamConfig from "../../config/eccParam/enterprise";
-import { ENTERPRISESYSTEMLABEL, FINANCINGROUNDS, FUHUAQILNVESTMENTSTYLE } from "../../config/enum";
+import { FINANCINGROUNDS, FUHUAQILNVESTMENTSTYLE } from "../../config/enum";
+import { LABELEVENT } from "../../config/enum/labelEnum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseFinancingListDataConfig } from "../../config/splitResultConfig";
 import { findEnterpriseByUscc } from "../../data/enterprise/enterprise";
@@ -14,7 +15,7 @@ import { BizError } from "../../util/bizError";
 import { checkChange, extractData } from "../../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { eccFormParam } from "../../util/verificationParam";
-import { enterpriseEventLabel } from "../label";
+import { enterpriseLabelEvent } from "../label";
 
 
 /**
@@ -77,7 +78,7 @@ export async function addEnterpriseFinancing(uscc:string, form) {
 
     //添加标签
     let financingRoundsStr = changeEnumValue(FINANCINGROUNDS, form.financingRounds);
-    enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.融资企业, `获得${financingRoundsStr}融资，${form.financingAmount}万元`);
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.融资, financingRoundsStr, form.financingAmount);
     await enterpriseInfo.save();
 
     return {isSuccess:true};

src/biz/mobileFuHuaQi/enterprise/enterprise.ts

@@ -16,8 +16,9 @@ import * as configEnum from "../../../config/enum";
 import { eccFormParam } from "../../../util/verificationParam";
 import * as verificationEnumTools from "../../../util/verificationEnum";
 import { checkChange, extractData } from "../../../util/piecemeal";
-import { enterpriseEventLabel } from "../../label";
+import { enterpriseLabelEvent } from "../../label";
 import { findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
+import { LABELEVENT } from "../../../config/enum/labelEnum";
 
 
 /**
@@ -123,7 +124,7 @@ export async function moveInEnterprise(uscc:string, param) {
 
         /**标签  迁入的是别人迁出的企业*/
         let fuHuaQiInfo = await findFuHuaQiByUSCC(uscc);
-        enterpriseEventLabel(dataBaseInfo, configEnum.ENTERPRISESYSTEMLABEL.迁出企业, fuHuaQiInfo.operationName);
+        await enterpriseLabelEvent(dataBaseInfo, LABELEVENT.迁出, fuHuaQiInfo.operationName);
 
         await dataBaseInfo.save();
     } else {

src/biz/mobileFuHuaQi/enterprise/myEnterprise.ts

@@ -14,16 +14,16 @@ import { eccFormParam, eccReqParamater } from "../../../util/verificationParam";
 import * as verificationEnumTools from "../../../util/verificationEnum";
 import { checkChange, extractData } from "../../../util/piecemeal";
 import * as scoreBiz from "../fuHuaQi/score";
-import { FUHUAQINODEENUM, POINTTYPEENUM } from "../../../config/pointConfig";
+import { FUHUAQINODEENUM } from "../../../config/pointConfig";
 import { addFuHuaQiPoint } from "../../point";
 import moment = require("moment");
 import { findEnterpriseNewTeamData } from "../../../data/enterprise/quarterTask/team";
 import { EnterpriseTeamConfig } from "../../../config/splitResultConfig";
 import { findBusinessDataByUsccAndYear } from "../../../data/enterprise/quarterTask/businessdata";
 import { selectRepleishData } from "../../../data/enterprise/replenish";
-import { enterpriseEventLabel } from "../../label";
-import { ENTERPRISESYSTEMLABEL } from "../../../config/enum";
+import { enterpriseLabelEvent } from "../../label";
 import { findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
+import { LABELEVENT } from "../../../config/enum/labelEnum";
 
 
 
@@ -150,10 +150,7 @@ export async function updatePhysicalInfo(fuHuaQiUscc:string, uscc:string, leased
         
         /**标签*/
         let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.虚拟企业, fuHuaQiInfo.operationName);
-        if (oldData.state == configEnum.FUHUASTATE.迁出) {
-            enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业, fuHuaQiInfo.operationName);
-        }
+        await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.孵化类型更新, fuHuaQiInfo.operationName);
     
     }
 
@@ -219,10 +216,7 @@ export async function updateVirtualInfo(fuHuaQiUscc:string, uscc:string, virtual
 
     /**标签*/
     let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
-    enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.虚拟企业, fuHuaQiInfo.operationName);
-    if (oldData.state == configEnum.FUHUASTATE.迁出) {
-        enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业, fuHuaQiInfo.operationName);
-    }
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.孵化类型更新, fuHuaQiInfo.operationName);
 
 
     await enterpriseInfo.save();
@@ -312,7 +306,7 @@ export async function updateMoveOutInfo(fuHuaQiUscc:string, uscc:string,  moveOu
 
     /**标签 */
     let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
-    enterpriseEventLabel(enterpriseInfo, ENTERPRISESYSTEMLABEL.迁出企业, fuHuaQiInfo.operationName);
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.迁出, fuHuaQiInfo.operationName);
 
     await enterpriseInfo.save();
 
@@ -418,10 +412,6 @@ export async function replenishMyEnterpriseInPutInfo(fuHuaQiUscc:string, param)
             dataBaseInfo[key] = param[key];
         }
 
-        /**标签  迁入的是别人迁出的企业*/
-        let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
-        enterpriseEventLabel(dataBaseInfo, ENTERPRISESYSTEMLABEL.迁出企业, fuHuaQiInfo.operationName);
-        await dataBaseInfo.save();
     } else {
         /**添加新注册企业标识 */
         param.isCreate = false;//标识此次操作是否是迁入企业并不是新注册企业
@@ -439,6 +429,11 @@ export async function replenishMyEnterpriseInPutInfo(fuHuaQiUscc:string, param)
     let qc = await enterpriseData.findEnterpriseCount({fuHuaQiUscc, state:configEnum.FUHUASTATE.迁出}) || 0; //迁出孵化
     addFuHuaQiPoint( fuHuaQiUscc, FUHUAQINODEENUM.企业状态变化, {xn, st, qc});
 
+    /**标签 */
+    let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.入孵, fuHuaQiInfo.operationName);
+
     return {isSuccess:true};
 }
 
@@ -473,6 +468,11 @@ export async function replenishMyEnterpriseCreateInfo(fuHuaQiUscc:string, param)
     let qc = await enterpriseData.findEnterpriseCount({fuHuaQiUscc, state:configEnum.FUHUASTATE.迁出, draftLock:true}) || 0; //迁出孵化 
     addFuHuaQiPoint(fuHuaQiUscc, FUHUAQINODEENUM.企业状态变化, {xn, st, qc});
 
+    /**标签 */
+    let fuHuaQiInfo = await findFuHuaQiByUSCC(fuHuaQiUscc);
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
+    await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.入孵, fuHuaQiInfo.operationName);
+
     return {isSuccess:true};
 }
 

src/biz/mobileFuHuaQi/fuHuaQi/base.ts

@@ -16,7 +16,7 @@ import { eccFormParam, eccReqParamater } from "../../../util/verificationParam";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import * as scoreBiz from "./score";
 import { addFuHuaQiPoint } from "../../point";
-import { FUHUAQINODEENUM, POINTTYPEENUM } from "../../../config/pointConfig";
+import { FUHUAQINODEENUM } from "../../../config/pointConfig";
 
 
 

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

@@ -7,11 +7,12 @@ import * as i18nRegisterData from "../../../../data/fuHuaQi/instituQualify/i18nR
 import * as icrData from "../../../../data/fuHuaQi/instituQualify/icr";
 import * as startupTeacherData from "../../../../data/fuHuaQi/instituQualify/startupTeacher";
 import * as zjBeyondLayoutData from "../../../../data/fuHuaQi/instituQualify/zjBeyondLayout";
-import { FHQSYSTEMLABEL, FUHUAINDUSTRY, STATEENUM } from "../../../../config/enum";
+import {  STATEENUM } from "../../../../config/enum";
 import * as fuhuaqiData from "../../../../data/fuHuaQi/fuhuaqi";
 import { addFuHuaQiPoint } from "../../../point";
 import * as pointConfig from "../../../../config/pointConfig";
 import { fuHuaQiEventLabel, inOnceLabelToFuHuaQi, outLabelToFuHuaQi } from "../../../label";
+import { FHQSYSTEMLABEL } from "../../../../config/enum/labelEnum";
 
 
 /**
@@ -112,7 +113,7 @@ export async function updateProfessionalTechnology(uscc:string, isProfessionalTe
     fuHuaQiInfo.cooperationInstitutions= cooperationInstitutions;//合作机构名称
 
     //标签
-    await fuHuaQiEventLabel(fuHuaQiInfo, FHQSYSTEMLABEL.专业技术平台, professionalTechnologyName);
+    fuHuaQiEventLabel(fuHuaQiInfo, FHQSYSTEMLABEL.专业技术平台, professionalTechnologyName);
 
 
     await fuHuaQiInfo.save();

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

@@ -13,21 +13,21 @@
  */
 
 import moment = require("moment");
-import { ENTERPRISESYSTEMLABEL, FINANCINGROUNDS, SCOREWAYS, TASKTYPEENUM } from "../../../../config/enum";
+import { FINANCINGROUNDS, SCOREWAYS, TASKTYPEENUM } from "../../../../config/enum";
 import { ERRORENUM } from "../../../../config/errorEnum";
 import * as enterpriseData from "../../../../data/enterprise/enterprise";
 import * as financingData from "../../../../data/fuHuaQi/monthTask/financing";
-import { findAllNotDisabledFuHuaQi } from "../../../../data/fuHuaQi/fuhuaqi";
+import { findAllNotDisabledFuHuaQi, findFuHuaQiByUSCC } from "../../../../data/fuHuaQi/fuhuaqi";
 import * as monthTableData from "../../../../data/fuHuaQi/monthTask/monthTable";
 import * as taskData from "../../../../data/fuHuaQi/monthTask/task";
 import { BizError } from "../../../../util/bizError";
 import { logHandle } from "../../../../util/log";
 import { getPwdMd5, getThisMonthMs, md5PwdStr } from "../../../../tools/system";
 import * as taskTool from "../../../../tools/taskTool";
-
 import * as scoreBiz from "../score";
-import { enterpriseEventLabel } from "../../../label";
+import { enterpriseLabelEvent } from "../../../label";
 import { changeEnumValue } from "../../../../util/verificationEnum";
+import { LABELEVENT } from "../../../../config/enum/labelEnum";
 
 
 /**   
@@ -210,6 +210,8 @@ export async function checkTask(uscc:string, taskType:number) {
     const TaskId = taskTool.getTaskId(uscc);
     let taskInfo = await taskData.findEnterpriseByTaskIdAndType(TaskId, taskType);
 
+    let fuHuaQiInfo = await findFuHuaQiByUSCC(uscc);
+    
     /**提交限制 */
     if (!taskInfo) throw new BizError(ERRORENUM.任务不存在, uscc, TaskId);
     if ( taskInfo.isSubmit ) throw new BizError(ERRORENUM.不能重复提交任务, uscc, taskType);
@@ -234,6 +236,13 @@ export async function checkTask(uscc:string, taskType:number) {
             submitCount = await enterpriseData.findEnterpriseCount({taskId:TaskId});
             /**更新分数 */
             await scoreBiz.updateScore(uscc, SCOREWAYS.任务得分, true, TASKTYPEENUM.新注册或迁入企业登记);
+            /**校验更新标签 */
+            let enterpriseList = await enterpriseData.findEnterpriseList({taskId:TaskId});
+            for (let i in enterpriseList) {
+                let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(enterpriseList[i].uscc);
+                await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.入孵, fuHuaQiInfo.operationName);
+                await enterpriseInfo.sava();
+            }
 
         break;
         case TASKTYPEENUM.融资企业填报:
@@ -247,7 +256,7 @@ export async function checkTask(uscc:string, taskType:number) {
             for (let i= 0; i < finacingDataList.length; i++) {
                 let itemEnterpriseInfo = await enterpriseData.findEnterpriseByUscc(finacingDataList[i].uscc);
                 let financingRoundsStr = changeEnumValue(FINANCINGROUNDS, finacingDataList[i].financingRounds);
-                enterpriseEventLabel(itemEnterpriseInfo, ENTERPRISESYSTEMLABEL.融资企业, `获得${financingRoundsStr}融资，${finacingDataList[i].financingAmount}万元`);
+                await enterpriseLabelEvent(itemEnterpriseInfo, LABELEVENT.融资, financingRoundsStr, finacingDataList[i].financingAmount);
                 await itemEnterpriseInfo.save();
             }
 

src/biz/mobileGuanWeiHui/enterpriseManage/base.ts

@@ -4,7 +4,7 @@
  */
 
 import moment = require("moment");
-import { ENTERPRISESYSTEMLABEL, FUHUASTATE, GUANWEIHUIMANANGENTERPRISELABEL, INDUSTRY, LABELGOAL, MOVEOUTTYPE } from "../../../config/enum";
+import { FUHUASTATE, INDUSTRY, MOVEOUTTYPE } from "../../../config/enum";
 import { findEnterpriseByUscc, findEnterpriseCount, findEnterpriseListToPage } from "../../../data/enterprise/enterprise";
 import { findLabelLogByParam } from "../../../data/enterprise/enterpriseLabelLog";
 import { getLabelNamMap } from "../../../data/label";
@@ -14,6 +14,7 @@ import { changeEnumManyValue, changeEnumValue, eccEnumValue } from "../../../uti
 import { BizError } from "../../../util/bizError";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { findFuHuaQiByUSCC, findFuHuaQiOperationNameMapByParam } from "../../../data/fuHuaQi/fuhuaqi";
+import { ENTERPRISESYSTEMLABEL, GUANWEIHUIMANANGENTERPRISELABEL, LABELGOAL } from "../../../config/enum/labelEnum";
 
 
 /**

src/biz/mobileGuanWeiHui/fuHuaQiManage/base.ts

@@ -11,6 +11,7 @@ import { changeAddToString } from "../../../tools/system";
 import { extractData } from "../../../util/piecemeal";
 import { changeEnumManyValue, changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import { findEnterpriseCount } from "../../../data/enterprise/enterprise";
+import { ENTERPRISESYSTEMLABEL, LABELGOAL } from "../../../config/enum/labelEnum";
 
 
 /**
@@ -73,7 +74,7 @@ export async function fuHuaQiInfomation(uscc:string) {
     //迁出企业
     fuHuaQiInfo.qianChuQiYe = await findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.迁出});
     //入驻非孵
-    fuHuaQiInfo.ruZhuFeiFu = await findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.实体孵化, labels: {"$elemMatch": {  "labelId":configEnum.ENTERPRISESYSTEMLABEL.入驻非孵, "state":true  }} });
+    fuHuaQiInfo.ruZhuFeiFu = await findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.实体孵化, labels: {"$elemMatch": {  "labelId":ENTERPRISESYSTEMLABEL.入驻非孵, "state":true  }} });
     //累计孵化
     fuHuaQiInfo.leiJiFuHua = await findEnterpriseCount({fuHuaQiUscc:uscc, state:configEnum.FUHUASTATE.迁出, moveOutType:configEnum.MOVEOUTTYPE.毕业迁出});
    
@@ -103,7 +104,7 @@ export async function fuHuaQiInfomation(uscc:string) {
     let dbLogList = await findLabelLogByParam({uscc:fuHuaQiInfo.uscc});
 
     let labelLogList = [];
-    let labelNameMap = await getLabelNamMap(configEnum.LABELGOAL.孵化器);
+    let labelNameMap = await getLabelNamMap(LABELGOAL.孵化器);
     dbLogList.forEach(info => {
         let { labelName } = labelNameMap[info.labelId];
         labelLogList.push({
@@ -151,7 +152,7 @@ export async function fuHuaQiList(name:string, pageNumber:number, labelId:string
 
     let dbList = await findFuHuaQiListByPage(param, (pageNumber-1)*10);
     let dataCount = await findFuHuaQiCount(param);
-    let labelNameMap = await getLabelNamMap(configEnum.LABELGOAL.孵化器);
+    let labelNameMap = await getLabelNamMap(LABELGOAL.孵化器);
     const config = {
         uscc:{key:"统一信用代码"},
         operationName:{key:"企业名称"},

src/biz/mobileGuanWeiHui/homePage.ts

@@ -9,9 +9,10 @@ import { findTaskListByParam } from "../../data/fuHuaQi/monthTask/task";
 import { statsAvgOccupancyRate } from "../../data/fuHuaQi/monthTask/monthTable";
 import { statsFinancingCount, statsFinancingEnterpriseCount } from "../../data/fuHuaQi/monthTask/financing";
 import { changeEnumValue } from "../../util/verificationEnum";
-import { INDUSTRY, LABELGOAL } from "../../config/enum";
+import { INDUSTRY } from "../../config/enum";
 import { getEffectiveLabelMap } from "../../data/label";
 import { statsFuHuaQiLabels } from "../../data/fuHuaQi/fuhuaqi";
+import { LABELGOAL } from "../../config/enum/labelEnum";
 
 
 /**

src/config/enum.ts

@@ -484,54 +484,6 @@ export enum CYCSRBJ {
     大学生创业
 }
 
-
-/**
- * 标签类型
- */
-export enum LABELTYPE {
-    系统标签 = 1,
-    自定义标签 = 2
-}
-
-export enum LABELGOAL {
-    孵化器 = 1,
-    企业
-}
-
-export enum LABELUPDATEROAD {
-    生效 = 1,
-    重新生效,
-    失效,
-}
-
-
-/**
- * 孵化器系统标签
- */
-export enum FHQSYSTEMLABEL {
-    专业技术平台 = "fhqzyjspt"
-}
-
-
-/**
- * 企业系统标签
- */
-export enum ENTERPRISESYSTEMLABEL {
-    在孵企业 = 'zfqy',
-    毕业企业 = "byqy",
-    拟毕业企业 = 'nbyqy',
-    融资企业 = 'rzqy',
-    上市企业 = 'ssqy',
-    高新企业 = 'gxqy',
-    专精特新 = 'zjtxqy',
-    小巨人 = 'xjrqy',
-    入驻非孵 = 'rzffqy',
-    虚拟企业 = 'xnqy',
-    迁出企业 = 'qcqy',
-    企业注销 = 'qyzx'
-}
-
-
 /**
  * 孵化器自定义任务类型
  */
@@ -541,13 +493,6 @@ export enum FUHUAQICUSTOMTASKTYPE {
 
 
 
-export enum GUANWEIHUIMANANGENTERPRISELABEL {
-    新注册企业 = 'xzcqy',
-    新迁入企业 = 'xqrqy',
-}
-
-
-
 export enum RAS {
     续存 = 1,
     注销 = 2

src/config/enum/labelEnum.ts

+/**
+ * 事件标签枚举
+ * 
+ */
+
+
+/**
+ * 企业系统标签
+ */
+export enum ENTERPRISESYSTEMLABEL {
+    在孵企业 = 'zfqy',
+    毕业企业 = "byqy",
+    拟毕业企业 = 'nbyqy',
+    融资企业 = 'rzqy',
+    上市企业 = 'ssqy',
+    高新企业 = 'gxqy',
+    专精特新 = 'zjtxqy',
+    小巨人 = 'xjrqy',
+    入驻非孵 = 'rzffqy',
+    虚拟企业 = 'xnqy',
+    迁出企业 = 'qcqy',
+    企业注销 = 'qyzx'
+}
+
+
+/**
+ * 孵化器系统标签
+ */
+export enum FHQSYSTEMLABEL {
+    专业技术平台 = "fhqzyjspt"
+}
+
+
+/**
+ * 标签状态
+ */
+export enum LABELUPDATEROAD {
+    生效 = 1,
+    重新生效,
+    失效,
+}
+
+
+/**
+ * 标签对象
+ */
+export enum LABELGOAL {
+    孵化器 = 1,
+    企业
+}
+
+
+/**
+ * 标签类型
+ */
+export enum LABELTYPE {
+    系统标签 = 1,
+    自定义标签 = 2
+}
+
+
+/**
+ * 兼容管委会中企业管理前俩选项并不是标签
+ */
+export enum GUANWEIHUIMANANGENTERPRISELABEL {
+    新注册企业 = 'xzcqy',
+    新迁入企业 = 'xqrqy',
+}
+
+/**
+ * 标签事件
+ */
+export enum LABELEVENT {
+    入孵 = 1,
+    迁出,
+    融资,
+    资质更新,
+    孵化类型更新
+}
+
+
+
+
+

src/routers/public.ts

@@ -3,8 +3,9 @@
  */
 
 import * as asyncHandler from 'express-async-handler';
-import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE, CYCXFX, CYCSRBJ, FUHUAQICUSTOMTASKTYPE, GUANWEIHUIMANANGENTERPRISELABEL, LABELGOAL, ENTERPRISESYSTEMLABEL, LABELTYPE, FHQSYSTEMLABEL } from '../config/enum';
+import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE, CYCXFX, CYCSRBJ, FUHUAQICUSTOMTASKTYPE } from '../config/enum';
 import { selectLabelList } from '../data/label';
+import { GUANWEIHUIMANANGENTERPRISELABEL, LABELTYPE, LABELGOAL, FHQSYSTEMLABEL } from '../config/enum/labelEnum';
 
 export function setRouter(httpServer) {
     httpServer.post('/public/fuhuaqilv', asyncHandler(getFuHuaQiLv));