no message

src/biz/fuhua.ts

@@ -30,7 +30,12 @@ export async function getBaseData() {
             "自用面积":0,
             "在孵企业":0,
             "迁出企业":0,
-            "毕业企业":0
+            "毕业企业":0,
+            "园区面积":0,//新增
+            "产业规模": 0,
+            "总资产投入金额": 0,
+            "引入机构数量": 0,
+            "引入机构投资": 0,
         },
         fuhuaPinfen:0, //孵化器评分 没有该字段
         fuhuaInfo:{ //孵化器信息
@@ -69,6 +74,12 @@ export async function getBaseData() {
         baseData.fuhuaData["总面积"] = yuyiList.totalArea;
         baseData.fuhuaData["在孵面积"] = yuyiList.zaifuArea;
         baseData.fuhuaData["自用面积"] = yuyiList.ziyonArea;   
+        baseData.fuhuaData["园区面积"] = yuyiList.parkArea;//新增
+        baseData.fuhuaData["产业规模"] = yuyiList.industrialScale;
+        baseData.fuhuaData["总资产投入金额"] = yuyiList.totalAssetInvestmentAmount;
+        baseData.fuhuaData["引入机构数量"] = yuyiList.numberOfInstitutionsIntroduced;
+        baseData.fuhuaData["引入机构投资"] = yuyiList.introduceInstitutionalInvestment;
+        
         baseData.fuhuaInfo = {
             "运营名称":yuyiList.operateName,
             "孵化器名称":yuyiList.name,

src/biz/zaiFu.ts

@@ -4,12 +4,13 @@
 
 import moment = require("moment");
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/enum/dbEnum";
-import { selectData, selectManyTableData } from "../data/operationalData";
+import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { changeAdd } from "../util/piecemeal";
 import { changeEnumValue } from "../util/verificationEnum";
 import * as enumConfig from "../config/enum/enum";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/enum/errorEnum";
+import { getMySqlMs } from "../tools/system";
 
 
 export async function enterpriseList(entepriseName:string, page:number) {
@@ -17,13 +18,17 @@ export async function enterpriseList(entepriseName:string, page:number) {
     if (entepriseName) {
         selectParam.enterpriseName = {"%like%":entepriseName}
     }
+
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "startTime", "endTime", "roomNumber"], where:{} }; 
+    // 关联企业孵化信息表，获取 moveOutTime 字段
+    manyTableInfo[TABLENAME.企业孵化信息] = { column: ["moveOutTime","moveOutType"], where: { state:{"%ne%": enumConfig.FUHUASTATE.迁出} } };
 
     let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page);
 
-    let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
+    // let dataCount = await selectManyTableData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
+    let dataCount = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
     
     let dataList = [];
     resInfo.forEach(info => {
@@ -48,11 +53,94 @@ export async function enterpriseList(entepriseName:string, page:number) {
     })
     
 
-    return {dataList, dataCount};
+    return {dataList, dataCount:dataCount.length};
 }
 
 
 /**
+ * 新增在孵企业迁出功能
+ */
+export async function enterpriseMoveOut(eId: string, moveOutType: number) {
+    let filesList = ["eId", "moveOutTime", "state"];
+    let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业孵化信息, { eId }, filesList);
+
+    if (!resInfo || !resInfo.eId) throw new BizError(ERRORENUM.数据不存在);
+
+    let addInfo = {
+        state: enumConfig.FUHUASTATE.迁出,
+        moveOutTime: getMySqlMs(),
+        moveOutType
+    };
+
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, addInfo, { eId });
+
+    return { isSuccess: true };
+}
+
+/**
+ * 迁出企业列表
+ * @param entepriseName 
+ * @param page 
+ * @returns 
+ */
+export async function enterpriseMigrateList(entepriseName:string, page:number) {
+    let selectParam:any = {};