no message

src/biz/admin.ts

@@ -84,14 +84,16 @@ export async function updateEnterpriseApplyFor(eId:string, param) {
 
 
 export async function enterpriseExamineList(year:number, entepriseName:string, page:number) {
+    let selectParam:any = {};
+    if (year) selectParam = {annual:getMySqlMs(year)};
     let filesList = [ "mId", "annual",  "BI", "TXP", "RD", "state"];
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName"], where:{} };
     if (entepriseName) {
         manyTableInfo[TABLENAME.企业基础信息表].where["enterpriseName"] = {"%like%":entepriseName}
     }
-    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业经营信息, {annual:getMySqlMs(year)}, filesList, manyTableInfo, page);
-    let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业经营信息, {annual:getMySqlMs(year)}, null);
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业经营信息, selectParam, filesList, manyTableInfo, page);
+    let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业经营信息, selectParam, null);
 
     let dataList = [];
     resInfo.forEach(info => {
@@ -107,6 +109,9 @@ export async function enterpriseExamineList(year:number, entepriseName:string, p
         dataList.push(dataInfo);
     })
     
+    dataList.sort( (a, b) => {
+        return b.annual - a.annual;
+    })
 
     return {dataList, dataCount};
 }
@@ -180,7 +185,7 @@ export async function enterpriseManageList(entepriseName:string, year:number, pa
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column: ["enterpriseName", "uscc"], where:{} };
     if (entepriseName) {
-        manyTableInfo[TABLENAME.企业经营信息].where["enterpriseName"] = {"%like%":entepriseName}
+        manyTableInfo[TABLENAME.企业基础信息表].where["enterpriseName"] = {"%like%":entepriseName}
     }
     let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业经营信息, selectParam, ["mId", "BI", "TXP", "RD", "annual", "state"], manyTableInfo, page);
     let dataCountList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业经营信息, selectParam, ["eId"], manyTableInfo);

src/biz/user.ts

@@ -29,7 +29,6 @@ export async function adminLogin(loginId:string, pwd:string) {
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.管理后台用户, updateUserInfo, {aId:adminUserInfo.aId});
     
-
     let userInfo = {
         userId:adminUserInfo.aId,
         userName:adminUserInfo.name,

src/biz/zaiFu.ts

@@ -6,6 +6,10 @@ import moment = require("moment");
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/enum/dbEnum";
 import { 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";
 
 
 export async function enterpriseList(entepriseName:string, page:number) {
@@ -13,7 +17,7 @@ export async function enterpriseList(entepriseName:string, page:number) {
     if (entepriseName) {
         selectParam.enterpriseName = {"%like%":entepriseName}
     }
-    let filesList = ["enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "startTime", "endTime", "roomNumber"], where:{} }; 
 
@@ -23,19 +27,20 @@ export async function enterpriseList(entepriseName:string, page:number) {
 
     let dataList = [];
     resInfo.forEach(info => {
-        let {enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, enterprise_leases} = info;
+        let {eId, enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, enterprise_leases} = 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 dataInfo = {
+            eId,
             enterpriseName, //企业名称
             uscc, //统一信用代码
             logonTime:moment(logonTime).format("YYYY-MM-DD"), //注册日期
             logonAddress:changeAdd(JSON.parse(logonAddress)), //注册地址
             qiYeGuiMo,//企业规模
-            leasesTime,//孵化时间
+            leasesTime,//租赁时间
             area:enterprise_leases[0].area+"㎡",//租赁面积
             roomNumber:enterprise_leases[0].roomNumber,//室号
         };
@@ -47,6 +52,313 @@ export async function enterpriseList(entepriseName:string, page:number) {
 }
 
 
+/**
+ * 在孵企业详情
+ * @param eId 
+ */
+export async function getDetails(eId:string) {
+    if (!eId) throw new BizError(ERRORENUM.参数错误, `在孵企业详细信息缺失eId`)
+
+    let details = {
+        enterprise: await enterpriseById(eId),
+        manage: await enterpriseManageById(eId),
+        financing: await enterpriseFinancingById(eId),
+        talent: await enterpriseTalentById(eId),
+        service: await enterpriseServiceById(eId),
+    }
+
+    return details;
+}
+
+
+
+
+/**
+ * 在孵企业详情 基础信息
+ * @param eId 
+ * @returns 
+ */
+export async function enterpriseById(eId:string) {
+    let filesList = ["enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.租赁信息] = {column:["area", "startTime", "endTime", "roomNumber"], where:{eId} }; 
+
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {eId}, filesList, manyTableInfo);
+
+    let dataList = [];
+    resInfo.forEach(info => {
+        let {enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, enterprise_leases} = 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 dataInfo = [
+            {
+                key:"企业名称",
+                value:enterpriseName
+            },
+            {
+                key:"统一信用代码",
+                value:uscc
+            },
+            {
+                key:"注册日期",
+                value:moment(logonTime).format("YYYY-MM-DD")
+            },
+            {
+                key:"注册地址",
+                value:changeAdd(JSON.parse(logonAddress))
+            },
+            {
+                key:"企业规模",
+                value:qiYeGuiMo
+            },
+            {
+                key:"租赁时间",
+                value:leasesTime
+            },
+            {
+                key:"租赁面积",
+                value:enterprise_leases[0].area+"㎡"
+            },
+            {
+                key:"室号",
+                value:enterprise_leases[0].roomNumber
+            }
+        ];
+        dataList.push(dataInfo);
+    })
+
+    return dataList;
+}
+
+
+/**
+ * 在孵企业详情 经营数据
+ * @param eId 
+ * @returns 
+ */
+export async function enterpriseManageById(eId:string) {
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业基础信息表] = {column: ["enterpriseName", "uscc"], where:{eId} };
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业经营信息, {eId}, ["mId", "BI", "TXP", "RD", "annual", "state"], manyTableInfo);
+    let resData = [];
+    resInfo.forEach( info => {
+        let {BI, mId, TXP,RD,state,annual, enterprise} = info;
+        resData.push({BI, mId, TXP,RD,state,annual:moment(annual).format("YYYY"), enterprise});
+    })
+    
+    resData.sort( (a, b) => {
+        return b.annual - a.annual;
+    })
+
+    let dataList = [];
+    resData.forEach(info => {
+        let {BI, mId, TXP,RD,state,annual, enterprise} = info;
+
+        let dataInfo = [
+            {
+                key:"企业名称",
+                value:enterprise.enterpriseName
+            },
+            {
+                key:"统一信用代码",
+                value:enterprise.uscc
+            },
+            {
+                key:"营收（万元）",
+                value:BI
+            },
+            {
+                key:"纳税（万元）",
+                value:TXP
+            },
+            {
+                key:"研发投入（万元）",
+                value:RD
+            },
+            {
+                key:"年度",
+                value:annual
+            },
+            {
+                key:"审核状态",
+                value:state ? "已审核" : "未审核"
+            }
+        ]
+        dataList.push(dataInfo);
+    });
+
+    return dataList;
+}
+
+
+/**
+ * 在孵企业详情 融资情况
+ * @param eId 
+ * @returns 
+ */
+export async function enterpriseFinancingById(eId:string) {
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业融资] = {column:["financingAmount", "financingRounds", "investmentDate", "investmentInstitutionsName" ], where:{eId} };
+    let filesList = ["enterpriseName", "uscc"];
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {eId}, filesList, manyTableInfo);
+    
+    let resData = [];
+    resInfo.forEach( info => {
+        let {enterpriseName, uscc, enterprise_financings} = info;
+        resData.push({enterpriseName, uscc, enterprise_financings, investmentDate:new Date(enterprise_financings[0].investmentDate).valueOf()});
+    })
+    
+    resData.sort( (a, b) => {
+        return b.investmentDate - a.investmentDate;
+    })
+
+    let dataList = [];
+    resData.forEach(info => {
+        let {enterpriseName, uscc, enterprise_financings} = info;
+
+        let dataInfo = [
+            {
+                key:"企业名称",
+                value:enterpriseName
+            },
+            {
+                key:"统一信用代码",
+                value:uscc
+            },
+            {
+                key:"融资金额（万元）",
+                value:enterprise_financings[0].financingAmount
+            },
+            {
+                key:"融资轮次",
+                value:changeEnumValue(enumConfig.FINANCINGROUNDS, enterprise_financings[0].financingRounds)
+            },
+            {
+                key:"获得投资时间",
+                value:moment(enterprise_financings[0].investmentDate).format("YYYY-MM-DD")
+            },
+            {
+                key:"投资机构名称",
+                value:enterprise_financings[0].investmentInstitutionsName
+            },
+        ]
+        dataList.push(dataInfo);
+    });
+
+    return dataList;
+}
+
+
+/**
+ * 在孵企业详情 创始团队
+ * @param eId 
+ * @returns 
+ */
+export async function enterpriseTalentById(eId:string) {
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName" ], where:{eId} };
+    let filesList = ["name", "sex", "birth", "degree", "graduationSchool"];
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.创业团队, {eId}, filesList, manyTableInfo);
+
+    let dataList = [];
+    resInfo.forEach(info => {
+        let {name, sex, birth, degree, graduationSchool, enterprise} = info;
+
+        let dataInfo = [
+            {
+                key:"姓名",
+                value:name
+            },
+            {
+                key:"性别",
+                value:changeEnumValue(enumConfig.SEX, sex)
+            },
+            {
+                key:"出生年月",
+                value:moment(birth).format("YYYY-MM-DD")
+            },
+            {
+                key:"最高学历",
+                value:changeEnumValue(enumConfig.DEGREE, degree)
+            },
+            {
+                key:"毕业学校",
+                value:graduationSchool
+            },
+            {
+                key:"企业名称",
+                value:enterprise.enterpriseName
+            },
+        ]
+
+        dataList.push(dataInfo);
+    });
+
+    return dataList;
+}
+
+
+/**
+ * 在孵企业详情 企业服务
+ * @param eId 
+ * @returns 
+ */
+export async function enterpriseServiceById(eId:string) {
+    let filesList = ["esId", "needCategory", "applyTime", "followUpStatus", "resolveTime", "needContent"];
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业基础信息表] = {column:["eId",  "enterpriseName"], where:{eId} };
+    let resList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业服务表, {eId}, filesList, manyTableInfo );
+
+    let resData = [];
+    resList.forEach( info => {
+        let {enterprise, needCategory, applyTime, followUpStatus, resolveTime, needContent} = info;
+        resData.push({enterprise, needCategory, applyTime:new Date(applyTime).valueOf(), followUpStatus, resolveTime, needContent});
+    })
+    
+    resData.sort( (a, b) => {
+        return b.applyTime - a.applyTime;
+    })
+
+    let dataList = [];
+    resData.forEach(info => {
+        let dataInfo = [
+            {
+                key:"企业名称",
+                value:info.enterprise.enterpriseName
+            },
+            {
+                key:"需求类别",
+                value:changeEnumValue(enumConfig.NEEDCATEGORY, info.needCategory)
+            },
+            {
+                key:"申请时间",
+                value:moment(info.applyTime).format("YYYY-MM-DD HH:mm")
+            },
+            {
+                key:"跟进状态",
+                value:changeEnumValue(enumConfig.FOLLOWUPSTATUS, info.followUpStatus)
+            },
+            {
+                key:"解决时间",
+                value:info.resolveTime ? moment(info.resolveTime).format("YYYY-MM-DD HH:mm") : '-'
+            },
+            {
+                key:"需求内容",
+                value:info.needContent
+            },
+        ]
+
+        dataList.push(dataInfo);
+    });
+
+    return dataList;
+}
+
+
+
 //下载
 export async function dwEnterpriseTable(entepriseName:string, type:number, files) {
     

src/routers/admin.ts

@@ -42,6 +42,12 @@ export function setRouter(httpServer) {
 
     //企业库信息
     httpServer.post('/admin/library/enterprise/list', checkUser, asyncHandler(enterpriseList));
+    httpServer.post('/admin/library/enterprise/details', checkUser, asyncHandler(enterpriseDetails));
+    // httpServer.post('/admin/library/enterprise/details', checkUser, asyncHandler(enterpriseById));
+    // httpServer.post('/admin/library/manage/details', checkUser, asyncHandler(manageById));
+    // httpServer.post('/admin/library/financing/details', checkUser, asyncHandler(financingById));
+    // httpServer.post('/admin/library/talent/details', checkUser, asyncHandler(talentById));
+    // httpServer.post('/admin/library/service/details', checkUser, asyncHandler(serviceById));
     httpServer.post('/admin/library/dw/enterprise/list', checkUser, asyncHandler(dwEnterpriseList));
     httpServer.post('/admin/library/manage/list', checkUser, asyncHandler(manageList));
     httpServer.post('/admin/library/dw/manage/list', checkUser, asyncHandler(outPutManageList));
@@ -315,6 +321,61 @@ async function enterpriseList(req, res) {
     res.success(result);
 }
 
+
+async function enterpriseDetails(req, res) {
+    const UserInfo = req.userInfo;
+    let {eId } = req.body
+    let result = await zaiFuBiz.getDetails(eId);
+
+    res.success(result);
+}
+
+
+// async function enterpriseById(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {eId } = req.body
+//     let result = await zaiFuBiz.enterpriseById(eId);
+
+//     res.success(result);
+// }
+
+
+// async function manageById(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {eId } = req.body
+//     let result = await zaiFuBiz.enterpriseManageById(eId);
+
+//     res.success(result);
+// }
+
+
+// async function financingById(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {eId } = req.body
+//     let result = await zaiFuBiz.enterpriseFinancingById(eId);
+
+//     res.success(result);
+// }
+
+
+// async function talentById(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {eId } = req.body
+//     let result = await zaiFuBiz.enterpriseTalentById(eId);
+
+//     res.success(result);
+// }
+
+
+// async function serviceById(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {eId } = req.body
+//     let result = await zaiFuBiz.enterpriseServiceById(eId);
+
+//     res.success(result);
+// }
+
+
 /**
  * 
  * @param req