Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiAdminServer

src/biz/admin.ts

@@ -71,7 +71,7 @@ export async function updateEnterpriseApplyFor(eId:string, param) {
         throw new BizError(ERRORENUM.数据不存在);
     }
     // 去掉审核状态的检查和更新逻辑
-    // if (resInfo.state == 1) {
+    // if (resInfo.state == 2) {
     //     throw new BizError(ERRORENUM.已审核请前往小程序登录)
     // } 
 

src/biz/fuhua.ts

@@ -4,7 +4,7 @@
 
 import moment = require("moment");
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
-import { BUILDING, CHANGETYPE, DEGREE, EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, OFFLINEPROMOTION, ONLINEPROMOTION, PROMOTIONTYPE, STATE } from "../config/enum/enum";
+import { BUILDING, CHANGESTATE, CHANGETYPE, DEGREE, EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, OFFLINEPROMOTION, ONLINEPROMOTION, PROMOTIONTYPE, STATE } from "../config/enum/enum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { getMySqlMs, randomId } from "../tools/system";
 import { changeEnumValue } from "../util/verificationEnum";
@@ -47,7 +47,7 @@ export async function getBaseData() {
     };
 
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime"];
-    let selectParam = {state:STATE.是};
+    let selectParam = {state:CHANGESTATE.已通过};
 
     /**在孵企业 当前时间小于孵化结束时间 */
     let araeParam = {column:["area", "unitPrice", "roomNumber", "rent", "startTime", "endTime"], where:{} };

src/biz/userRuFu.ts

@@ -128,12 +128,11 @@ export async function createRuFu(uId, param) {
     const FuncName = "网页添加信息填写"
     eccFormParam(FuncName, UserRegisterAddConfig, param );
 
-    let filesList = ["eId", "uscc"];
-    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
-
-    if (enterpriseUserInfo && enterpriseUserInfo.eId) {
-        throw new BizError(ERRORENUM.企业已存在);
-    }
+    // let filesList = ["eId", "uscc"];
+    // let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
+    // if (enterpriseUserInfo && enterpriseUserInfo.eId) {
+    //     throw new BizError(ERRORENUM.企业已存在);
+    // }
     
     let addEInfo = {
         eId:randomId(TABLEID.企业基础信息表),

src/biz/zaiFu.ts

@@ -11,87 +11,33 @@ import * as enumConfig from "../config/enum/enum";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/enum/errorEnum";
 import { getMySqlMs } from "../tools/system";
-import { log } from "console";
 import { BUILDING } from "../config/enum/enum";
 
+
 /**
- * 备份在孵企业列表
+ * 在孵企业列表
+ * @param enterpriseName 
+ * @param page 
+ * @param logonStartTime 
+ * @param logonEndTime 
+ * @param startTime 
+ * @param endTime 
+ * @param building 
+ * @returns 
  */
-// export async function enterpriseList(enterpriseName:string, page:number, logonTime:string, startTime:number, endTime:number, building:string) {
-//     let selectParam:any = {state:1};
-//     if (enterpriseName) {
-//         selectParam.enterpriseName = {"%like%":enterpriseName}
-//     }
-//     if (logonTime) {
-//         // 假设 logonTime 是一个具体的日期字符串，例如 "2023-01-01"
-//         selectParam.logonTime = logonTime;
-//     }
-    
-//     selectParam["enterprise_leases.startTime"] = { "%gte%": startTime };
-//     selectParam["enterprise_leases.endTime"] = { "%lte%": endTime };
-    
-//     if (building) {
-//         selectParam["enterprise_leases.building"] = building
-//     }
-
-//     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
-//     let manyTableInfo:any = {};
-//     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "startTime", "endTime", "roomNumber" ,"building"], where:{} }; 
-//     // 关联企业孵化信息表，获取 moveOutTime 字段
-//     manyTableInfo[TABLENAME.企业孵化信息] = { column: ["moveOutTime","moveOutType","startTime" ,"endTime"], where: { state:{"%ne%": enumConfig.FUHUASTATE.迁出} } };
-
-//     let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page);
-
-//     // let dataCount = await selectManyTableData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
-//     let dataCount = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
-    
-//     let dataList = [];
-//     resInfo.forEach(info => {
-//         let {eId, enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, enterprise_leases, enterprise_fuhuas} = info;
-//         let leasesTime = '-'
-//         if (enterprise_leases[0].startTime){
-//             leasesTime = `${moment(enterprise_leases[0].startTime).format("YYYY-MM-DD")}至${moment(enterprise_leases[0].endTime).format("YYYY-MM-DD")}`;
-//         }
-
-//         let fuhuaTime = '-';
-//         if (enterprise_fuhuas[0].startTime) {
-//             fuhuaTime = `${moment(enterprise_fuhuas[0].startTime).format("YYYY-MM-DD")}至${moment(enterprise_fuhuas[0].endTime).format("YYYY-MM-DD")}`;
-//         }
-
-//         let dataInfo = {
-//             eId,
-//             enterpriseName, //企业名称
-//             uscc, //统一信用代码
-//             logonTime:moment(logonTime).format("YYYY-MM-DD"), //注册日期
-//             logonAddress:changeAdd(JSON.parse(logonAddress)), //注册地址
-//             qiYeGuiMo,//企业规模
-//             fuhuaTime,//孵化时间
-//             leasesTime,//租赁时间
-//             area:enterprise_leases[0].area+"㎡",//租赁面积
-//             building:enterprise_leases[0].building,//楼栋
-//             roomNumber:enterprise_leases[0].roomNumber,//室号
-//         };
-//         dataList.push(dataInfo);
-//     })
-    
-
-//     return {dataList, dataCount:dataCount.length};
-// }
 export async function enterpriseList(enterpriseName:string, page:number, logonStartTime:string, logonEndTime:string, startTime: number,endTime: number, building: number ) {
-    let selectParam: any = { state: 1 };
-
-    if (enterpriseName) { selectParam.enterpriseName = { "%like%": enterpriseName };}
-
+    let selectParam: any = { state: enumConfig.CHANGESTATE.已通过};
+    if (enterpriseName) { 
+        selectParam.enterpriseName = { "%like%": enterpriseName };
+    }
     if (logonStartTime && logonEndTime) {
         selectParam.logonTime = {"%between%":[getMySqlMs(logonStartTime), getMySqlMs(logonEndTime)]}
     }
 
     // 主表字段过滤参数保持不变
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
-
     // 子表配置：租赁信息
     let leaseWhere:any = {};
-    // console.log(getMySqlMs(startTime), getMySqlMs(endTime))
     if (startTime && endTime) {
         if (!leaseWhere["%literal%"]) {
             leaseWhere["%literal%"] = `(startTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}' 
@@ -104,23 +50,22 @@ export async function enterpriseList(enterpriseName:string, page:number, logonSt
     }
 
     if (building) {
-        leaseWhere.building = building;
+        if (!leaseWhere["%literal%"]) {
+            leaseWhere["%literal%"] = `building = ${building}`;
+        } else {
+            leaseWhere["%literal%"] += ` and building = ${building}`;
         }
-    
+    }
+    // leaseWhere.building = building;
     
     let manyTableInfo: any = {};
-
-    // 租赁信息表配置
-    manyTableInfo[TABLENAME.租赁信息] = {
-        column: ["area", "startTime", "endTime", "building", "roomNumber"],
-        where: leaseWhere
-    };
-
-    // 企业孵化信息表配置
-    manyTableInfo[TABLENAME.企业孵化信息] = {
-        column: ["moveOutTime", "moveOutType", "startTime", "endTime"],
-        where: {"%literal%": `enterprise_fuhuas.state <> ${enumConfig.FUHUASTATE.迁出}`}
-    }
+    manyTableInfo[TABLENAME.租赁信息] = { column: ["area", "startTime", "endTime", "building", "roomNumber"], where: leaseWhere };
+    // manyTableInfo[TABLENAME.企业孵化信息] = {
+    //     column: ["moveOutTime", "moveOutType", "startTime", "endTime"],
+    //     where: 
+    //     // {"state": {"%ne%":enumConfig.FUHUASTATE.迁出}} 
+    //     {"%literal%": `enterprise_fuhuas.state <> ${enumConfig.FUHUASTATE.迁出}`}
+    // }
 
     // 查询分页数据
     let resInfo = await selectManyTableData( OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
@@ -130,25 +75,28 @@ export async function enterpriseList(enterpriseName:string, page:number, logonSt
 
     let dataList = [];
     for (let info of resInfo) {
-        const {
+        let {
             eId,
             enterpriseName,
             uscc,
             logonTime,
             logonAddress,
             qiYeGuiMo,
-            enterprise_leases,
-            enterprise_fuhuas
+            enterprise_leases
         } = info;
 
+        let rufuSelectParam = { eId, state: { "%between%": [enumConfig.FUHUASTATE.实体孵化, enumConfig.FUHUASTATE.虚拟孵化] } };
+        let rufuInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业孵化信息, rufuSelectParam, ["moveOutTime", "moveOutType", "startTime", "endTime"]);
+        if (!Object.keys(rufuInfo).length) continue;
+
         let leasesTime = '-';
         if (enterprise_leases[0]?.startTime) {
             leasesTime = `${moment(enterprise_leases[0].startTime).format("YYYY-MM-DD")}至${moment(enterprise_leases[0].endTime).format("YYYY-MM-DD")}`;
         }
 
         let fuhuaTime = '-';
-        if (enterprise_fuhuas[0]?.startTime) {
-            fuhuaTime = `${moment(enterprise_fuhuas[0].startTime).format("YYYY-MM-DD")}至${moment(enterprise_fuhuas[0].endTime).format("YYYY-MM-DD")}`;
+        if (rufuInfo?.startTime) {
+            fuhuaTime = `${moment(rufuInfo.startTime).format("YYYY-MM-DD")}至${moment(rufuInfo.endTime).format("YYYY-MM-DD")}`;
         }
 
         dataList.push({

src/routers/dbinit.ts

@@ -7,7 +7,7 @@ import { checkEnterpriseUser, checkInterior, checkUser } from '../middleware/use
 import { getMySqlMs, getPinyinInitials, randomId } from '../tools/system';
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from '../config/enum/dbEnum';
 import { changeEnumValue } from '../util/verificationEnum';
-import { DEGREE, FUHUASTATE, IPRALLTYPE, ZZMM } from '../config/enum/enum';
+import { CHANGESTATE, DEGREE, FUHUASTATE, IPRALLTYPE, ZZMM } from '../config/enum/enum';
 import { operationalData } from '../data/operationalData';
 import { onceSheetBecomeOfblockData } from '../util/analysisExcel';
 const xlsx = require('node-xlsx');
@@ -151,8 +151,8 @@ export async function data1210(req, res) {
             liaison:subList[13],
             liaisonPhone:subList[14]+'',
             shuiWuJu:subList[17] || '',
-            state:1,
-            register:1,
+            state:CHANGESTATE.已通过,
+            register:CHANGESTATE.已通过,
             
         };