no message

src/biz/fuhua.ts

@@ -4,7 +4,7 @@
 
 import moment = require("moment");
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
-import { CHANGETYPE, EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, STATE } from "../config/enum/enum";
+import { BUILDING, CHANGETYPE, EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, STATE } from "../config/enum/enum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { getMySqlMs, randomId } from "../tools/system";
 import { changeEnumValue } from "../util/verificationEnum";
@@ -40,15 +40,17 @@ export async function getBaseData() {
             // "引入机构投资": 0,
         },
         fuhuaPinfen:0, //孵化器评分 没有该字段
-        fuhuaInfo:{ //孵化器信息
-        }
+        fuhuaInfo:{ //孵化器信息   
+        },
+        entryInfo: {}, // 孵化器入驻信息
+        promotionInfo: {} // 运营推广信息
     };
 
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime"];
     let selectParam = {state:STATE.是};
 
     /**在孵企业 当前时间小于孵化结束时间 */
-    let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
+    let araeParam = {column:["area", "unitPrice", "roomNumber", "rent", "startTime", "endTime"], where:{} };
     let zaifuTableInfo:any = {};
     zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
     zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{state:{"%ne%":FUHUASTATE.迁出}} };
@@ -94,11 +96,7 @@ export async function getBaseData() {
         // baseData.fuhuaData["总资产投入金额"] = yuyiList.totalAssetInvestmentAmount;
         // baseData.fuhuaData["引入机构数量"] = yuyiList.numberOfInstitutionsIntroduced;
         // baseData.fuhuaData["引入机构投资"] = yuyiList.introduceInstitutionalInvestment;
-        
-        // 计算出租率
-        if (baseData.fuhuaData["孵化器总面积"] > 0) {
-            baseData.fuhuaData["出租率"] = ((baseData.fuhuaData["在孵面积"] / baseData.fuhuaData["孵化器总面积"]) * 100).toFixed(2);
-        }
+        baseData.fuhuaData["出租率"] = yuyiList.rentRate;//出租率
 
         baseData.fuhuaInfo = {
             "运营名称":yuyiList.operateName,
@@ -117,6 +115,45 @@ export async function getBaseData() {
         }
     }
 
+    /**
+     * 孵化器入驻信息
+     */
+    let entryList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.入驻信息表, {}, []);
+    baseData.entryInfo = {};
+
+    entryList.forEach(entry => {
+        const building = changeEnumValue(BUILDING, entry.building);
+        baseData.entryInfo[building] = {
+            "入驻率": entry.occupancyRate,
+            "入驻企业": entry.enteredEnterprises,
+        };
+    });
+
+    /**
+     * 运营推广(次数)
+     */
+    let promotionList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.运营推广信息表, {}, []);
+    baseData.promotionInfo = {
+        "线上推广": "",
+        "抖音": "",
+        "小红书": "",
+        "视频号": "",
+        "线下推广": "",
+        "活动宣讲": "",
+        "三方机构合作": "",
+    };
+    
+    promotionList.forEach(promotion => {
+        baseData.promotionInfo["线上推广"] += promotion.onlinePromotion || "";
+        baseData.promotionInfo["抖音"] += promotion.tiktok || "";
+        baseData.promotionInfo["小红书"] += promotion.theLittleRedBook || "";
+        baseData.promotionInfo["视频号"] += promotion.videoNumber || "";
+        baseData.promotionInfo["线下推广"] += promotion.offlinePromotion || "";
+        baseData.promotionInfo["活动宣讲"] += promotion.eventPromotion || "";
+        baseData.promotionInfo["三方机构合作"] += promotion.tripartiteInstitutionalCooperation || "";
+    });
+
+
     return {baseData};
 }
 
@@ -126,81 +163,215 @@ export async function getBaseData() {
  * 出租率变化趋势暂未接入数据库数据
  * 孵化器收入暂未接入数据库数据
  */
+// export async function getOperateData(year) {
+//     // let yearTime = moment(year).format("YYYY-MM-DD");
+//     // console.log(yearTime);
+//     let yearTime = moment(year, "YYYY").startOf('year').format("YYYY-MM-DD");
+//     console.log("yearTime:", yearTime);
+
+
+//     let operateData = {
+//         "当前在孵企业数":0,
+//         "在孵企业数变化趋势":{
+//             "实体孵化":[],
+//             "虚拟孵化":[],
+//         },
+//         "毕业企业数变化趋势":{
+//             "毕业企业":[]
+//         },
+//         "出租率变化趋势":[],
+//         "在孵企业行业领域":[],
+//         "孵化器收入":[]
+//     };
+//     let qushiConf = {"01":0, "02":0, "03":0, "04":0, "05":0, "06":0, "07":0, "08":0, "09":0, "10":0, "11":0, "12":0};
+//     // let qushiConf = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
+
+//     /**在孵企业 */
+//     // let zaifuParam = {state:{"%notIn%":FUHUASTATE.迁出}};
+//     let zaifuParam = {startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}, state:{"%notIn%":FUHUASTATE.迁出}};
+//     console.log("zaifuParam:", zaifuParam);
+
+//     let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, zaifuParam, {});
+//     console.log("zaifuList length:", zaifuList.length);
+
+//     operateData.当前在孵企业数 = zaifuList.length;
+//     let zaifuStateInfo = {
+//         "实体孵化":qushiConf, 
+//         "虚拟孵化":qushiConf
+//     };
+//     zaifuList.forEach( info => {
+//         let state = changeEnumValue(FUHUASTATE, info.state);
+//         let time = moment(info.endTime).format("YYYY-MM");
+//         let year = moment(info.endTime).format("YYYY");
+//         let month = moment(info.endTime).format("MM");
+//         if (!zaifuStateInfo[state]) zaifuStateInfo[state] = {};
+//         // if (year == yearTime) {
+//         if (year === moment(yearTime).format("YYYY")) {
+//             zaifuStateInfo[state][month] += 1;
+//         }
+//     })
+
+//     for (let key in zaifuStateInfo["实体孵化"]) {
+//         operateData.在孵企业数变化趋势.实体孵化.push({key, value:zaifuStateInfo["实体孵化"][key].toString()});
+//     }
+//     //X轴排序
+//     operateData.在孵企业数变化趋势.实体孵化.sort( (a, b) => {
+//         return a.key - b.key;
+//     })
+
+//     for (let key in zaifuStateInfo["虚拟孵化"]) {
+//         operateData.在孵企业数变化趋势.虚拟孵化.push({key, value:zaifuStateInfo["虚拟孵化"][key].toString()});
+//     }
+//     //X轴排序
+//     operateData.在孵企业数变化趋势.虚拟孵化.sort( (a, b) => {
+//         return a.key - b.key;
+//     })
+
+
+//     /**毕业企业 */
+//     let biyeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {graduationTime:{"%ne%":null}}, {});//state:{"%ne%":0}
+//     let biyeInfo = qushiConf;
+//     biyeList.forEach( info => {
+//         let year = moment(info.graduationTime).format("YYYY");
+//         let month = moment(info.graduationTime).format("MM");
+//         // if (year == yearTime) {
+//         if (year === moment(yearTime).format("YYYY")) {
+//             biyeInfo[month] += 1;
+//         }
+//     })
+    
+
+//     for(let key in biyeInfo) {
+//         operateData.毕业企业数变化趋势.毕业企业.push({key, value:biyeInfo[key].toString()});
+//     }
+//     //X轴排序
+//     operateData.毕业企业数变化趋势.毕业企业.sort( (a, b) => {
+//         return a.key - b.key;
+//     })
+
+
+//     /**出租率 */
+//     let chuzulvParam = {startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}};
+//     // let chuzulvList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME., chuzulvParam);
+//     let chuzulvInfo = qushiConf;
+//     for(let key in chuzulvInfo) {
+//         operateData.出租率变化趋势.push({key, value:chuzulvInfo[key].toString()});
+//     }
+//     //X轴排序
+//     operateData.出租率变化趋势.sort( (a, b) => {
+//         return a.key - b.key;
+//     })
+
+
+//     /**在孵企业行业领域 */
+//     /**在孵企业 当前时间小于孵化结束时间 */
+//     let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
+//     let zaifuTableInfo:any = {};
+//     zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
+//     zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}, state:{"%notIn%":FUHUASTATE.迁出}} };
+//     // let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {endTime:{"%lt%":nowTime}}, {});
+//     let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, ["eId", "industry"], zaifuTableInfo );
+    
+//     for (let key in INDUSTRY) {
+//         let industryData:any = {};
+//         let anyKey:any = key;
+//         if (isNaN(anyKey)) {
+//             const EnumValue = parseInt(INDUSTRY[key])
+//             industryData = {key:anyKey, value:0};
+//             zaifuResList.forEach( info => {
+//                 if (info.industry == EnumValue) {
+//                     industryData.value += 1;
+//                 }
+//             })
+//             operateData.在孵企业行业领域.push(industryData);
+//         }
+//     }
+
+
+//     /**孵化器收入 */
+//     for (let key in INCOME) {
+//         let anyKey:any = key;
+//         if (isNaN(anyKey)) {
+//             operateData.孵化器收入.push({key:anyKey, value:0});
+//         }
+//     }
+
+//     return {operateData};
+// }
 export async function getOperateData(year) {
-    let yearTime = moment(year).format("YYYY");
+    let yearTime = moment(year, "YYYY").startOf('year').format("YYYY-MM-DD");
+    console.log("yearTime:", yearTime);
 
     let operateData = {
-        "当前在孵企业数":0,
-        "在孵企业数变化趋势":{
-            "实体孵化":[],
-            "虚拟孵化":[],
+        "当前在孵企业数": 0,
+        // "在孵企业数变化趋势": [], // 修改：不再区分实体/虚拟
+        "在孵企业数变化趋势": {
+            "在孵企业": []
         },
-        "毕业企业数变化趋势":{
-            "毕业企业":[]
+        "毕业企业数变化趋势": {
+            "毕业企业": []
         },
-        "出租率变化趋势":[],
-        "在孵企业行业领域":[],
-        "孵化器收入":[]
+        "出租率变化趋势": [],
+        "在孵企业行业领域": [],
+        "孵化器收入": []
     };
-    let qushiConf = {"01":0, "02":0, "03":0, "04":0, "05":0, "06":0, "07":0, "08":0, "09":0, "10":0, "11":0, "12":0};
-    // let qushiConf = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
+    let qushiConf = { "01": 0, "02": 0, "03": 0, "04": 0, "05": 0, "06": 0, "07": 0, "08": 0, "09": 0, "10": 0, "11": 0, "12": 0 };
 
     /**在孵企业 */
-    // let zaifuParam = {state:{"%notIn%":FUHUASTATE.迁出}};
-    let zaifuParam = {startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}, state:{"%notIn%":FUHUASTATE.迁出}};
+    let zaifuParam = {
+        startTime: { "%lt%": yearTime },
+        endTime: { "%gt%": yearTime },
+        state: { "%notIn%": [FUHUASTATE.迁出] }
+    };
+    
+
     let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, zaifuParam, {});
+
     operateData.当前在孵企业数 = zaifuList.length;
-    let zaifuStateInfo = {
-        "实体孵化":qushiConf, 
-        "虚拟孵化":qushiConf
-    };
-    zaifuList.forEach( info => {
-        let state = changeEnumValue(FUHUASTATE, info.state);
-        let time = moment(info.endTime).format("YYYY-MM");
+
+    // 新增：统一统计每个月的数据
+    let trendInfo = { ...qushiConf }; // 初始化每月数据为0
+
+    zaifuList.forEach(info => {
         let year = moment(info.endTime).format("YYYY");
         let month = moment(info.endTime).format("MM");
-        if (!zaifuStateInfo[state]) zaifuStateInfo[state] = {};
-        if (year == yearTime) {
-            zaifuStateInfo[state][month] += 1;
-        }
-    })
 
-    for (let key in zaifuStateInfo["实体孵化"]) {
-        operateData.在孵企业数变化趋势.实体孵化.push({key, value:zaifuStateInfo["实体孵化"][key].toString()});
-    }
-    //X轴排序
-    operateData.在孵企业数变化趋势.实体孵化.sort( (a, b) => {
-        return a.key - b.key;
-    })
+        if (year === moment(yearTime).format("YYYY")) {
+            trendInfo[month] += 1;
+        }
+    });
 
-    for (let key in zaifuStateInfo["虚拟孵化"]) {
-        operateData.在孵企业数变化趋势.虚拟孵化.push({key, value:zaifuStateInfo["虚拟孵化"][key].toString()});
+    // 转换为数组并排序
+    for (let key in trendInfo) {
+        operateData.在孵企业数变化趋势.在孵企业.push({ key, value: trendInfo[key].toString() });
     }
-    //X轴排序
-    operateData.在孵企业数变化趋势.虚拟孵化.sort( (a, b) => {
-        return a.key - b.key;
-    })
 
+    operateData.在孵企业数变化趋势.在孵企业.sort((a, b) => a.key - b.key);
 
     /**毕业企业 */
-    let biyeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {graduationTime:{"%ne%":null}}, {});
-    let biyeInfo = qushiConf;
-    biyeList.forEach( info => {
-        let year = moment(info.graduationTime).format("YYYY");
-        let month = moment(info.graduationTime).format("MM");
-        if (year == yearTime) {
+    let biyeList = await selectData(
+        OPERATIONALDATATYPE.查询多个,
+        TABLENAME.企业孵化信息,
+        { moveOutType: EMIGRATIONTYPE.毕业迁出 }, {}); // 只查毕业迁出的企业
+
+    let biyeInfo = { ...qushiConf }; // 每月初始化为0
+
+    biyeList.forEach(info => {
+        let graduationTime = info.graduationTime || info.moveOutTime; // 如果graduationTime不存在用moveOutTime代替
+        if (!graduationTime) return;
+
+        let year = moment(graduationTime).format("YYYY");
+        let month = moment(graduationTime).format("MM");
+
+        if (year === moment(yearTime).format("YYYY")) {
             biyeInfo[month] += 1;
         }
-    })
-
-    for(let key in biyeInfo) {
-        operateData.毕业企业数变化趋势.毕业企业.push({key, value:biyeInfo[key].toString()});
-    }
-    //X轴排序
-    operateData.毕业企业数变化趋势.毕业企业.sort( (a, b) => {
-        return a.key - b.key;
-    })
+    });
 
+    operateData.毕业企业数变化趋势.毕业企业 = Object.keys(biyeInfo)
+        .map(key => ({ key, value: biyeInfo[key].toString() }))
+        // .sort((a, b) => a.key - b.key);
+        .sort((a, b) => parseInt(a.key) - parseInt(b.key));
 
     /**出租率 */
     let chuzulvParam = {startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}};
@@ -216,39 +387,56 @@ export async function getOperateData(year) {
 
 
     /**在孵企业行业领域 */
-    /**在孵企业 当前时间小于孵化结束时间 */
-    let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
-    let zaifuTableInfo:any = {};
+    // let araeParam = { column: ["area", "unitPrice", "roomNumber", "rent"], where: {} };
+    let araeParam = { column: ["area", "building", "roomNumber", "rent"], where: {} };
+    let zaifuTableInfo: any = {};
     zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
-    zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{startTime:{"%lt%":yearTime}, endTime:{"%gt%":yearTime}, state:{"%notIn%":FUHUASTATE.迁出}} };
-    // let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {endTime:{"%lt%":nowTime}}, {});
-    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, ["eId", "industry"], zaifuTableInfo );
+    zaifuTableInfo[TABLENAME.企业孵化信息] = {
+        column: ["state", "startTime", "endTime"],
+        where: { startTime: { "%lt%": yearTime }, endTime: { "%gt%": yearTime }, state: { "%notIn%": FUHUASTATE.迁出 } },
+    };
+    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {}, ["eId", "industry"], zaifuTableInfo);
+    // console.log("zaifuResList:", zaifuResList);
     
+    //将 industry 字符串转换为数组
+    zaifuResList.forEach(info => {
+        if (typeof info.industry === 'string') {
+            try {
+                info.industry = JSON.parse(info.industry);
+            } catch (e) {
+                console.error("Failed to parse industry:", e);
+                info.industry = []; // 如果解析失败，设置为默认空数组
+            }
+        }
+    });
+
     for (let key in INDUSTRY) {
-        let industryData:any = {};
-        let anyKey:any = key;
+        let industryData: any = {};
+        let anyKey: any = key;
         if (isNaN(anyKey)) {
-            const EnumValue = parseInt(INDUSTRY[key])
-            industryData = {key:anyKey, value:0};
-            zaifuResList.forEach( info => {
+            const EnumValue = parseInt(INDUSTRY[key]);
+            industryData = { key: anyKey, value: 0 };
+            zaifuResList.forEach(info => {
                 if (info.industry == EnumValue) {
                     industryData.value += 1;
                 }
-            })
+            });
+            
             operateData.在孵企业行业领域.push(industryData);
         }
+        
     }
 
-
     /**孵化器收入 */
     for (let key in INCOME) {
-        let anyKey:any = key;
+        let anyKey: any = key;
         if (isNaN(anyKey)) {
-            operateData.孵化器收入.push({key:anyKey, value:0});
+            operateData.孵化器收入.push({ key: anyKey, value: 0 });
         }
     }
 
-    return {operateData};
+
+    return { operateData };
 }
 
 
@@ -299,6 +487,7 @@ export async function getWorthDate() {
 
     /**纳税趋势 */
     let nashuiList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, {}, {});
+    
     let nashuiData = {};
     nashuiList.forEach( info => {
         let year = moment(info.annual).format("YYYY");

src/biz/ruFu.ts

@@ -40,7 +40,7 @@ import { changeEnumValue } from "../util/verificationEnum";
         uscc:param.uscc,
         logonTime:getMySqlMs(param.logonTime),
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
-        mail:param.mail,//邮箱
+        mail:param.mail,//邮箱地址
         state:0,
         register:0
     };
@@ -104,7 +104,7 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
     let selectParam:any = {register:enumConfig.STATE.否, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "mail"];
 
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent", "totalPrice"], where:{} };
@@ -118,9 +118,9 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
     resList.forEach(info => {
         dataList.push({
             eId:info.eId,
-            enterpriseName:info.enterpriseName,
-            uscc:info.uscc,
-            logonTime:moment(info.logonTime).format("YYYY-MM-DD"),
+            enterpriseName:info.enterpriseName,//企业名称
+            uscc:info.uscc,//统一信用代码
+            logonTime:moment(info.logonTime).format("YYYY-MM-DD"),//注册时间
             leaseTime:`${moment(info.enterprise_leases[0].startTime).format("YYYY-MM-DD")}至${moment(info.enterprise_leases[0].endTime).format("YYYY-MM-DD")}`,
             // leaseTimeStart:info.enterprise_leases[0].startTime || 0,
             // leaseTimeEnd:info.enterprise_leases[0].endTime || 0,
@@ -128,18 +128,19 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
             leaseEnd: moment(info.enterprise_leases[0].endTime).format("YYYY-MM-DD"),
             fuHuaTimeStart:info.enterprise_fuhuas[0].startTime||0,
             fuHuaTimeEnd:info.enterprise_fuhuas[0].endTime||0,
-            area:info.enterprise_leases[0].area,
-            unitPrice:info.enterprise_leases[0].unitPrice,
+            area:info.enterprise_leases[0].area,//租赁面积
+            unitPrice:info.enterprise_leases[0].unitPrice,//——暂时没用
             // roomNumber:info.enterprise_leases[0].roomNumber,
             building: info.enterprise_leases[0].building || "",// 园区楼号
             roomNumber: info.enterprise_leases[0].roomNumber || "",// 室号
-            rent:info.enterprise_leases[0].rent,
-            logonAddress:changeAdd(JSON.parse(info.logonAddress)),
-            userName:info.enterprise_users[0].userName,
-            pwd:info.enterprise_users[0].pwd,
-            phone:info.enterprise_users[0].phone,
+            rent:info.enterprise_leases[0].rent,//月租金
+            logonAddress:changeAdd(JSON.parse(info.logonAddress)),//注册地址
+            userName:info.enterprise_users[0].userName,//联系人
+            pwd:info.enterprise_users[0].pwd,//登录密码
+            phone:info.enterprise_users[0].phone,//登录手机号
+            mail:info.mail,//邮箱地址
             uId:info.enterprise_users[0].uId,
-            totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段
+            totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段——暂时没用
             status: info.approval_historys.changeState === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射 todo
         });
     });
@@ -233,7 +234,7 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
     let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone:param.phone}, ["uId"]);
     if (userInfo && userInfo.uId &&  userInfo.uId != param.uId) throw new BizError(ERRORENUM.手机号码重复);
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state", "mail"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
@@ -245,6 +246,7 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
         uscc:param.uscc,
         logonTime:param.logonTime,
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
+        // mail:param.mail,
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
     
@@ -264,6 +266,8 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
         rent:param.rent,
         startTime: param.fuHuaTimeStart, //租赁开始日期
         endTime: param.fuHuaTimeEndTime, //租赁结束日期
+        // building:param.building,
+        // roomNumber:param.roomNumber,
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, leaseInfo, {eId});
 

src/config/eccParam/enterprise.ts

@@ -40,14 +40,18 @@ export const SettleInForUpdateConfig = {
     logonAddress:{type:"String"},//注册地址
     fuHuaTimeStart:{type:"Number"},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
+    // leaseTimeStart:{type:"Number"},//租赁开始时间
+    // leaseTimeEndTime:{type:"Number"},//租赁结束时间
     area:{type:"Number"},//面积
     // unitPrice:{type:"Number"},//单价
+    building:{type:"String"},//楼号
     roomNumber:{type:"String"},//室号
     rent:{type:"Number"},//每月租金
     // totalPrice:{type:"Number"},//总价
     pwd:{type:"String"},
     phone:{type:"String"},
     userName:{type:"String"},
+    // mail:{type:"String"},//邮箱
     uId:{type:"String"}
 }
 
@@ -79,7 +83,7 @@ export const AdminRegisterAddConfig = {
     userName:{type:"String",required: true, message: '用户名不能为空'},
     leaseStartTime: { type: 'string', required: true, message: '租赁开始时间不能为空' },
     leaseEndTime: { type: 'string', required: true, message: '租赁结束时间不能为空' },
-    email: { type: 'string', required: true, message: '邮箱地址不能为空' },
+    mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
 }
 
 
@@ -107,6 +111,16 @@ export const YuYiBaseDataUpdateConfig = {
     zaifuArea:{type:"String"},//在孵面积
     rentRate:{type:"String"},//出租率
     uscc:{type:"String"},//统一信用代码
+    building:{type:"String"},//楼号
+    occupancyRate:{type:"String"},//入驻率
+    enteredEnterprises:{type:"String"},//入驻企业
+    onlinePromotion:{type:"String"},//线上推广
+    offlinePromotion:{type:"String"},//线下推广
+    tiktok:{type:"String"},//抖音
+    theLittleRedBook:{type:"String"},//小红书
+    videoNumber:{type:"String"},//视频号
+    eventPromotion:{type:"String"},//活动宣讲
+    tripartiteInstitutionalCooperation:{type:"String"},//三方机构合作
     // ziyonArea:{type:"String"},//自用面积
     // parkArea:{type:"String"},//新增
     // industrialScale:{type:"String"},
@@ -128,7 +142,7 @@ export const UserRegisterAddConfig = {
     rent:{type:"Number", required: true, message: '每月租金不能为空'},//每月租金
     leaseStartTime: { type: 'string', required: true, message: '租赁开始时间不能为空' },
     leaseEndTime: { type: 'string', required: true, message: '租赁结束时间不能为空' },
-    email: { type: 'string', required: true, message: '邮箱地址不能为空' },
+    mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
     userName: { type: 'string', required: true, message: '联系人不能为空' },
     phone: { type: 'string', required: true, message: '登录手机号码不能为空' },
     pwd: { type: 'string', required: true, message: '登录密码不能为空' },

src/config/enum/dbEnum.ts

@@ -39,6 +39,8 @@ export enum TABLENAME {
     政策表 = 'policy',
     管理后台用户 = 'adminUser',
     入孵申请审批表 ='approval_history',
+    入驻信息表 = "info_enter",
+    运营推广信息表 = "info_operation_promotion",
     
 }
 
@@ -62,5 +64,8 @@ export enum TABLEID {
     企业基础信息表 ='e',
     图片存储='img',
     政策表 = 'zc',
-    入孵申请审批表 = 'ah'
+    入孵申请审批表 = 'ah',
+    入驻信息表 = "ei",
+    运营推广信息表 = "opi",
+ 
 } 
\ No newline at end of file