Skip to content

Y
yuyiAdminServer
Commit d2b7d026 by Zllgogo
Options

no message

parent d963c21f
Showing with 74 additions and 70 deletions
.vscode/launch.json
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "node", "type": "node",
"request": "launch", "request": "launch",
......
package-lock.json
...@@ -1890,6 +1890,11 @@ ...@@ -1890,6 +1890,11 @@
"mime-types": "~2.1.24" "mime-types": "~2.1.24"
} }
}, },
"typescript": {
"version": "3.9.10",
"resolved": "https://registry.npmmirror.com/typescript/-/typescript-3.9.10.tgz",
"integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="
},
"universalify": { "universalify": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "http://localhost:4873/universalify/-/universalify-0.1.2.tgz", "resolved": "http://localhost:4873/universalify/-/universalify-0.1.2.tgz",
......
package.json
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"request": "^2.88.0", "request": "^2.88.0",
"svg-captcha": "^1.3.12", "svg-captcha": "^1.3.12",
"tencentcloud-sdk-nodejs": "^4.0.562", "tencentcloud-sdk-nodejs": "^4.0.562",
"typescript": "^3.9.10",
"ws": "^5.2.2", "ws": "^5.2.2",
"xml2js": "^0.4.23" "xml2js": "^0.4.23"
}, },
......
src/biz/zaiFu.ts
...@@ -876,67 +876,66 @@ export async function dwEnterpriseService(eId: string) { ...@@ -876,67 +876,66 @@ export async function dwEnterpriseService(eId: string) {
/** /**
* 迁出企业下载-----暂时不用 * 迁出企业下载-----暂时不用
*/ */
// export async function dwEnterpriseOutTable(entepriseName: string, type: number, files) { 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 };
// }
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/routers/admin.ts
...@@ -439,16 +439,16 @@ async function dwEnterpriseList(req, res) { ...@@ -439,16 +439,16 @@ async function dwEnterpriseList(req, res) {
/** /**
* qianchuqiy下载 * 迁出企业下载
* @param req * @param req
* @param res * @param res
*/ */
// async function dwEnterpriseOutList(req, res) { async function dwEnterpriseOutList(req, res) {
// let {entepriseName, type, files } = req.body let {entepriseName, type, files } = req.body
// let result = await zaiFuBiz.dwEnterpriseOutTable(entepriseName, type, files); let result = await zaiFuBiz.dwEnterpriseOutTable(entepriseName, type, files);
// res.success(result); res.success(result);
// } }
/** /**
* 在孵企业下载 * 在孵企业下载
......
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