no message

src/biz/fuhua.ts

@@ -155,147 +155,6 @@ 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, "YYYY").startOf('year').format("YYYY-MM-DD");
     console.log("yearTime:", yearTime);

src/biz/ruFu.ts

@@ -44,7 +44,7 @@ import { systemConfig } from "../config/serverConfig";
         logonTime:getMySqlMs(param.logonTime),
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
         mail:param.mail,//邮箱地址
-        state:0,
+        state:enumConfig.CHANGESTATE.未审核,
         register:enumConfig.CHANGESTATE.未审核
     };
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
@@ -104,10 +104,9 @@ import { systemConfig } from "../config/serverConfig";
  */
 export async function settleInEnterpriseList(page:number, enterpriseName:string) {
     let selectParam:any = {state:enumConfig.CHANGESTATE.未审核, "%or%":[{register:enumConfig.CHANGESTATE.未审核}, {register:enumConfig.CHANGESTATE.已驳回}]};
-    // let selectParam:any = {register:enumConfig.CHANGESTATE.未审核, state:enumConfig.CHANGESTATE.未审核};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "mail"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "mail", "register"];
 
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "building", "roomNumber", "rent", "startTime", "endTime"], where:{} };
@@ -144,7 +143,7 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
             mail:info.mail,//邮箱地址
             uId:info.enterprise_users[0].uId,
             // totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段——暂时没用
-            status: info.register === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射
+            status: info.register == enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射
         });
         
     });
@@ -165,7 +164,6 @@ export async function settleInEnterprisePass(eId:string) {
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
     }
-    // if (resInfo.state) throw new BizError(ERRORENUM.该企业已通过审核);
     
     let updateInfo = {
         register:enumConfig.CHANGESTATE.已通过,
@@ -341,7 +339,7 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
     // let selectParam:any = {register:enumConfig.STATE.是, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "randomCode", "state"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "randomCode", "state", "register"];
 
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["leaseContract", "entryPlan", "businessLicense", "agreement"], where:{} };
@@ -356,15 +354,15 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
             eId:info.eId,
             enterpriseName:info.enterpriseName,
             randomCode:info.randomCode,
-            leaseContractUrl: `${systemConfig.fileUrl}${info.enterprise_leases[0].leaseContract}` ||  "未提交",
-            entryPlanUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].entryPlan}` ||  "未提交",
-            businessLicenseUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].businessLicense}` ||  "未提交",
-            agreementUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].agreement}` ||  "未提交",
+            leaseContractUrl: info.enterprise_leases[0].leaseContract ||  "未提交",
+            entryPlanUrl: info.enterprise_leases[0].entryPlan ||  "未提交",
+            businessLicenseUrl: info.enterprise_leases[0].businessLicense ||  "未提交",
+            agreementUrl: info.enterprise_leases[0].agreement ||  "未提交",
             leaseContract: getFileNameAndFormat(info.enterprise_leases[0].leaseContract),
             entryPlan: getFileNameAndFormat(info.enterprise_leases[0].entryPlan),
             businessLicense: getFileNameAndFormat(info.enterprise_leases[0].businessLicense),
             agreement: getFileNameAndFormat(info.enterprise_leases[0].agreement),
-            status: info.state === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射
+            status: info.state == enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射
         });
     });
     
@@ -443,6 +441,7 @@ function getFileNameAndFormat(fileName: string | null | undefined): string {
  * @returns 
  */
 export async function enterpriseRegisterExaminePass(eId:string) {
+    if (!eId) throw new BizError(ERRORENUM.参数错误);
     let manyTableInfo:any = {}
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
     manyTableInfo[TABLENAME.租赁信息] = {column:["leaseContract", "entryPlan", "businessLicense", "agreement"], where:{} };
@@ -453,7 +452,6 @@ export async function enterpriseRegisterExaminePass(eId:string) {
     if (!resInfo.enterprise_leases[0].leaseContract || !resInfo.enterprise_leases[0].entryPlan || !resInfo.enterprise_leases[0].businessLicense || !resInfo.enterprise_leases[0].agreement) {
         throw new BizError(ERRORENUM.请上传所有入孵材料);
     }
-    // if (resInfo.state) throw new BizError(ERRORENUM.该企业已通过审核);
     
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, {state:enumConfig.CHANGESTATE.已通过}, {eId});
 
@@ -476,7 +474,7 @@ export async function enterpriseRegisterExaminePass(eId:string) {
     let zaifuTableInfo:any = {};
     zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
     zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} };
-    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state:enumConfig.STATE.是}, ["eId"], zaifuTableInfo );
+    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state:enumConfig.CHANGESTATE.已通过}, ["eId"], zaifuTableInfo );
     
     zaifuResList.forEach( info => {
         info.enterprise_leases.forEach( lease => {
@@ -496,6 +494,7 @@ export async function enterpriseRegisterExaminePass(eId:string) {
  * @returns 
  */
 export async function enterpriseRegisterExamineOut(eId:string) {
+    if (!eId) throw new BizError(ERRORENUM.参数错误);
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
 

src/biz/zaiFu.ts

@@ -38,24 +38,24 @@ export async function enterpriseList(enterpriseName:string, page:number, logonSt
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
     // 子表配置：租赁信息
     let leaseWhere:any = {};
-    if (startTime && endTime) {
-        if (!leaseWhere["%literal%"]) {
-            leaseWhere["%literal%"] = `(startTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}' 
-            or endTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}') `;
-        }
-        // leaseWhere["%or%"] = [
-        //     {startTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }},
-        //     {endTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }}
-        // ]
-    }
+    // if (startTime && endTime) {
+    //     if (!leaseWhere["%literal%"]) {
+    //         leaseWhere["%literal%"] = `(enterprise_lease.startTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}' 
+    //         or enterprise_lease.endTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}') `;
+    //     }
+    //     // leaseWhere["%or%"] = [
+    //     //     {startTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }},
+    //     //     {endTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }}
+    //     // ]
+    // }
 
-    if (building) {
-        if (!leaseWhere["%literal%"]) {
-            leaseWhere["%literal%"] = `building = ${building}`;
-        } else {
-            leaseWhere["%literal%"] += ` and building = ${building}`;
-        }
-    }
+    // if (building) {
+    //     if (!leaseWhere["%literal%"]) {
+    //         leaseWhere["%literal%"] = `enterprise_lease.building = '${building}'`;
+    //     } else {
+    //         leaseWhere["%literal%"] += ` and enterprise_lease.building = '${building}'`;
+    //     }
+    // }
     // leaseWhere.building = building;
     
     let manyTableInfo: any = {};

src/config/eccParam/enterprise.ts

@@ -47,10 +47,10 @@ export const SettleInForUpdateConfig = {
     phone:{type:"String"},
     pwd:{type:"String"},
     mail:{type:"String"},//邮箱
-    area:{type:"Number"},//面积
     rent:{type:"Number"},//每月租金
-    building:{type:"String"},//楼号
-    roomNumber:{type:"String"},//室号
+    area:{type:"Number", required: false},//面积非必填
+    building: { type: 'string', required: false }, // 租赁楼号非必填
+    roomNumber:{type:"String", required: false},//室号非必填
     // unitPrice:{type:"Number"},//单价
     // totalPrice:{type:"Number"},//总价
 }

src/config/enum/enum.ts

@@ -176,6 +176,7 @@ export  enum POLICYTYPE {
  * 政策类型前端用
  */
 export  enum CLIENTPOLICYTYPE { 
+    全部 = 0,
     财政补贴 = 1,
     资质申报 = 2,
     政策扶持 = 3

src/config/serverConfig.ts

@@ -16,7 +16,7 @@ export async function initConfig() {
 		if (!configInfo || !configInfo.config) throw new BizError('xml中无配置');
 		else {
             
-            let {port, sign, dbServer, imgUrl, imgFileUrl, fileUrl, qcc } = configInfo.config;
+            let {port, sign, dbServer, imgUrl, imgFileUrl, qcc } = configInfo.config;
             systemConfig.port = parseInt(port[0]);
 
             systemConfig.dbSign = sign[0];
@@ -24,7 +24,7 @@ export async function initConfig() {
             
             systemConfig.imgUrl = imgUrl[0];
             systemConfig.imgFileUrl = imgFileUrl[0];
-            systemConfig.fileUrl = fileUrl[0];
+            // systemConfig.fileUrl = fileUrl[0];
 
             systemConfig.qccKey  = qcc[0].key[0];
             systemConfig.qccSecretKey  = qcc[0].SecretKey[0];

src/config/systemClass.ts

@@ -11,7 +11,6 @@ export class ServerConfig {
     imgPath:string; 
     imgUrl:String;
     imgFileUrl:String;
-    fileUrl:String;
     /**企查查 */
     qccKey:string;
     qccSecretKey:string;

src/routers/dbinit.ts

@@ -24,20 +24,20 @@ export async function data1210(req, res) {
         {
             info_enterId:randomId(TABLEID.入驻信息表),
             building:'1',
-            occupancyRate:"",
-            enteredEnterprises:""
+            occupancyRate:"0%",
+            enteredEnterprises:"0"
         },
         {
             info_enterId:randomId(TABLEID.入驻信息表),
             building:'3',
-            occupancyRate:"",
-            enteredEnterprises:""
+            occupancyRate:"0%",
+            enteredEnterprises:"0"
         },
         {
             info_enterId:randomId(TABLEID.入驻信息表),
             building:'4',
-            occupancyRate:"",
-            enteredEnterprises:""
+            occupancyRate:"0%",
+            enteredEnterprises:"0"
         },
     ]
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.入驻信息表, 入驻信息add, {});