Skip to content

Y
yuyiAdminServer
Commit d963c21f by zhangzhencai
Options

no message

parent 8e7eba12
Showing with 253 additions and 13 deletions
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:{ //孵化器信息
......@@ -68,7 +73,13 @@ export async function getBaseData() {
if (yuyiList) {
baseData.fuhuaData["总面积"] = yuyiList.totalArea;
baseData.fuhuaData["在孵面积"] = yuyiList.zaifuArea;
baseData.fuhuaData["自用面积"] = yuyiList.ziyonArea;
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,14 +18,18 @@ 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 => {
let {eId, enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, enterprise_leases} = info;
......@@ -48,9 +53,92 @@ 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 = {};
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:enumConfig.FUHUASTATE.迁出 } };
let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page);
let dataCount = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
// let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业基础信息表, selectParam, null);
let dataList = [];
resInfo.forEach(info => {
let {eId, enterpriseName, uscc, logonTime, logonAddress, enterprise_fuhuas, qiYeGuiMo, enterprise_leases} = info;
let formattedMoveOutTime = '-';
if (enterprise_fuhuas[0].moveOutTime) {
formattedMoveOutTime = moment(enterprise_fuhuas[0].moveOutTime).format("YYYY-MM-DD");
}
let formattedMoveOutTypeName = '-';
if (enterprise_fuhuas[0].moveOutType) {
formattedMoveOutTypeName = changeEnumValue(enumConfig.EMIGRATIONTYPE, parseInt(String(enterprise_fuhuas[0].moveOutType)));
}
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)), //注册地址
moveOutTime:formattedMoveOutTime,//新增迁出时间
moveOutType:formattedMoveOutTypeName,//新增迁出类型
qiYeGuiMo,//企业规模
leasesTime,//租赁时间
area:enterprise_leases[0].area+"㎡",//租赁面积
roomNumber:enterprise_leases[0].roomNumber,//室号
};
dataList.push(dataInfo);
})
return {dataList, dataCount:dataCount.length};
}
/**
* 在孵企业详情
......@@ -782,4 +870,73 @@ export async function dwEnterpriseService(eId: string) {
return {dataList};
}
\ No newline at end of file
}
/**
* 迁出企业下载-----暂时不用
*/
// export async function dwEnterpriseOutTable(entepriseName: string, type: number, files) {
// let selectParam: any = {};
// if (type == 1) {
// if (entepriseName) {
// selectParam.enterpriseName = { "%like%": entepriseName }
// }
// }
// let filesList = ["enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
// let manyTableInfo: any = {};
// manyTableInfo[TABLENAME.租赁信息] = { column: ["area", "startTime", "endTime", "roomNumber"], where: {} };
// // 关联企业孵化信息表，获取 moveOutTime 和 moveOutType 字段
// manyTableInfo[TABLENAME.企业孵化信息] = { column: ["moveOutTime", "moveOutType"], where: {} };
// let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
// let dataList = [];
// let titleList = []
// let valueList = [];
// files.forEach(item => {
// titleList.push(item.key);
// valueList.push(item.value);
// });
// dataList.push(titleList);
// resInfo.forEach(info => {
// let { enterpriseName, uscc, logonTime, logonAddress, qiYeGuiMo, moveOutTime, moveOutType, 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 formattedMoveOutTime = '-';
// if (moveOutTime) {
// formattedMoveOutTime = moment(moveOutTime).format("YYYY-MM-DD");
// }
// let formattedMoveOutTypeName = '-';
// if (moveOutType !== undefined && moveOutType !== null) {
// formattedMoveOutTypeName = changeEnumValue(enumConfig.EMIGRATIONTYPE, moveOutType);
// }
// let subList = [];
// valueList.forEach(subInfo => {
// if (subInfo == "enterpriseName") subList.push(enterpriseName); //企业名称
// if (subInfo == "uscc") subList.push(uscc); //统一信用代码
// if (subInfo == "logonTime") subList.push(moment(logonTime).format("YYYY-MM-DD")); //注册日期
// if (subInfo == "logonAddress") subList.push(changeAdd(JSON.parse(logonAddress))); //注册地址
// if (subInfo == "qiYeGuiMo") subList.push(qiYeGuiMo); //企业规模
// if (subInfo == "startTime") subList.push(leasesTime); //租赁时间
// if (subInfo == "area") subList.push(enterprise_leases[0].area + "㎡"); //租赁面积
// if (subInfo == "roomNumber") subList.push(enterprise_leases[0].roomNumber); //室号
// if (subInfo == "moveOutTime") subList.push(formattedMoveOutTime); //迁出时间
// if (subInfo == "moveOutType") subList.push(formattedMoveOutTypeName); //迁出类型
// });
// dataList.push(subList);
// });
// return { dataList };
// }
src/config/eccParam/enterprise.ts
......@@ -108,6 +108,11 @@ export const YuYiBaseDataUpdateConfig = {
totalArea:{type:"String"},//总面积
zaifuArea:{type:"String"},//在孵面积
ziyonArea:{type:"String"},//自用面积
parkArea:{key:"园区面积"},//新增
industrialScale:{key:"产业规模"},
totalAssetInvestmentAmount:{key:"总资产投入金额"},
numberOfInstitutionsIntroduced:{key:"引入机构数量"},
introduceInstitutionalInvestment:{key:"引入机构投资"}
}
......
src/config/enum/dbEnum.ts
......@@ -12,7 +12,7 @@ export enum OPERATIONALDATATYPE {
查询数据量='/yuyi/dataserver/mysql/table/find/count',
多表联查='/yuyi/dataserver/mysql/table/find/aggragate',
多表分页='/yuyi/dataserver/mysql/table/find/aggragatetopage',
多表单个='/yuyi/dataserver/mysql/table/find/aggragateone'
多表单个='/yuyi/dataserver/mysql/table/find/aggragateone',
}
/**
......
src/config/enum/enum.ts
......@@ -66,6 +66,15 @@ export enum FUHUASTATE {
迁出= 4
}
/**
* 迁出类型
*/
export enum EMIGRATIONTYPE {
毕业迁出 = 1,
到期退租,
违约退租
}
/**
* 上市情况
......@@ -190,9 +199,11 @@ export enum INTELLECTUALPROPERTYRIGHT {
*/
export enum IPRTYPECLIENT {
其他 = 0,
软件著作 = 1,
// 软件著作 = 1,
软件著作权 = 1,
发明专利,
海外专利,
专利
}
/**
......@@ -204,6 +215,14 @@ export enum IPRTYPECLIENTQT {
}
/**
 * 知识产权类型专利 前端用
 */
export enum IPRTYPECLIENTZL {
发明专利 = 2,
海外专利,
}
/**
* 知识产权及专利
......
src/config/enum/errorEnum.ts
......@@ -31,7 +31,9 @@ export enum ERRORENUM {
企业已存在,
已审核请前往小程序登录,
用户已存在,
手机号码重复
手机号码重复,
数据库错误,
该企业已迁出
}
export enum ERRORCODEENUM {
......
src/config/splitResult/enterprise.ts
......@@ -34,6 +34,11 @@ export const YuYiBaseDataConfig = {
totalArea:{key:"总面积"},
zaifuArea:{key:"在孵面积"},
ziyonArea:{key:"自用面积"},
parkArea:{key:"园区面积"},//新增
industrialScale:{key:"产业规模"},
totalAssetInvestmentAmount:{key:"总资产投入金额"},
numberOfInstitutionsIntroduced:{key:"引入机构数量"},
introduceInstitutionalInvestment:{key:"引入机构投资"}
}
src/routers/admin.ts
......@@ -44,6 +44,8 @@ export function setRouter(httpServer) {
//企业库信息
httpServer.post('/admin/library/enterprise/list', checkUser, asyncHandler(enterpriseList));
httpServer.post('/admin/library/enterprise/migrate/out', checkUser, asyncHandler(enterpriseMigrateOut));//在孵企业迁出功能
httpServer.post('/admin/library/enterprise/migrate/list', checkUser, asyncHandler(enterpriseMigrateList));//新增迁出企业
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));
......@@ -51,6 +53,7 @@ export function setRouter(httpServer) {
// 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/dw/enterprise/out/list', checkUser, asyncHandler(dwEnterpriseOutList));//迁出企业下载
httpServer.post('/admin/library/dw/alloutput/list', checkUser, asyncHandler(getAllDwOutPutData));//在孵企业单企业下载
httpServer.post('/admin/library/dw/businessdata/list', checkUser, asyncHandler(dwBusinessDataList));//单企业经营数据下载
httpServer.post('/admin/library/dw/financingsituatione/list', checkUser, asyncHandler(dwFinancingSituationeList));//单企业融资情况下载
......@@ -342,6 +345,32 @@ async function enterpriseList(req, res) {
}
/**
* 在孵企业迁出功能
* @param req
* @param res
*/
async function enterpriseMigrateOut(req, res) {
const UserInfo = req.userInfo;
let { eId, moveOutType } = req.body
let result = await zaiFuBiz.enterpriseMoveOut(eId, moveOutType);
res.success(result);
}
/**
* 迁出企业列表
* @param req
* @param res
*/
async function enterpriseMigrateList(req, res) {
const UserInfo = req.userInfo;
let {entepriseName, page } = req.body
let result = await zaiFuBiz.enterpriseMigrateList(entepriseName, page);
res.success(result);
}
async function enterpriseDetails(req, res) {
const UserInfo = req.userInfo;
let {eId } = req.body
......@@ -410,6 +439,18 @@ async function dwEnterpriseList(req, res) {
/**
* qianchuqiy下载
* @param req
* @param res
*/
// async function dwEnterpriseOutList(req, res) {
// let {entepriseName, type, files } = req.body
// let result = await zaiFuBiz.dwEnterpriseOutTable(entepriseName, type, files);
// res.success(result);
// }
/**
* 在孵企业下载
* @param req
* @param res
......
src/routers/fuhua.ts
......@@ -6,13 +6,13 @@ import * as fuhuaBiz from '../biz/fuhua';
export function setRouter(httpServer) {
// httpServer.post('/admin/fuhua/base', checkUser, asyncHandler(baseData));
httpServer.post('/admin/fuhua/base', asyncHandler(baseData));
httpServer.post('/admin/fuhua/base', asyncHandler(baseData));//
httpServer.post('/admin/fuhua/operate', asyncHandler(operateData));
httpServer.post('/admin/fuhua/risk', asyncHandler(riskData));
httpServer.post('/admin/fuhua/worth', asyncHandler(worthDate));
httpServer.post('/admin/fuhua/rufu/add', asyncHandler(addRuFu));
httpServer.post('/admin/fuhua/rufu/info', asyncHandler(getRuFu));
httpServer.post('/admin/fuhua/rufu/update', asyncHandler(updateRuFu));
httpServer.post('/admin/fuhua/rufu/update', asyncHandler(updateRuFu));//
httpServer.post('/admin/fuhua/yuyi/info', asyncHandler(yuYiRuFu));
httpServer.post('/admin/fuhua/yuyi/update', asyncHandler(updateYuYi));
}
......
src/routers/public.ts
......@@ -26,6 +26,7 @@ const config = {
"/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
"/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
"/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
"/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利
// "/public/output/basedata":outputEnumConfig.BASEDATA,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment