no message

src/biz/admin.ts

@@ -310,9 +310,7 @@ export async function enterpriseFinancingList(enterpriseName:string, year:number
     }
 
     let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page);
-    let dataCountList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
-    
-    let dataCount = dataCountList.length;
+    // let dataCountList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo);
     
     let dataList = [];
     resInfo.forEach(info => {
@@ -334,7 +332,7 @@ export async function enterpriseFinancingList(enterpriseName:string, year:number
         
     });
 
-    return {dataList, dataCount};
+    return {dataList, dataCount:dataList.length};
 }
 
 

src/biz/zaiFu.ts

@@ -878,10 +878,10 @@ export async function dwEnterpriseService(eId: string) {
 
 
 /**
- * 迁出企业下载-----暂时不用
+ * 迁出企业下载
+ * @params type:1(当前数据)，type:2(全部数据下载)
  */
 export async function dwEnterpriseOutTable(entepriseName: string, type: number, files) {
-    
     let selectParam: any = {};
     if (type == 1) {
         if (entepriseName) {
@@ -889,12 +889,19 @@ export async function dwEnterpriseOutTable(entepriseName: string, type: number,
         }
     }
     
-    let filesList = ["enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
-    let manyTableInfo: any = {};
-    manyTableInfo[TABLENAME.租赁信息] = { column: ["area", "startTime", "endTime", "roomNumber"], where: {} }; 
+    // 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: {} };
 
-    // 关联企业孵化信息表，获取 moveOutTime 和 moveOutType 字段
-    manyTableInfo[TABLENAME.企业孵化信息] = { column: ["moveOutTime", "moveOutType"], where: {} };
+    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);
 
@@ -943,3 +950,6 @@ export async function dwEnterpriseOutTable(entepriseName: string, type: number,
 
     return { dataList };
 }
+
+
+

src/config/enum/outputEnum.ts

@@ -50,4 +50,17 @@ export enum ENTERPRISESERVICE {
     需求内容="needContent"
 }
 
+/**迁出企业 */
+export enum ENTERPRISEBASEMOVEOUT {
+    企业名称="enterpriseName",
+    统一信用代码 = "uscc",
+    注册时间 = "logonTime",
+    迁出时间 = "moveOutTime",
+    迁出类型 = "moveOutType",
+    注册地址 = "logonAddress",
+    企业规模 = "qiYeGuiMo",
+    租赁时间 = "startTime",
+    租赁面积 = "area"
+}
+
 

src/routers/admin.ts

@@ -53,7 +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/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));//单企业融资情况下载
@@ -297,11 +297,6 @@ async function policyDel(req, res) {
 }
 
 
-
-
-
-
-
 /**
  * 
  * @param req 

src/routers/dbinit.ts

@@ -7,7 +7,7 @@ import { checkEnterpriseUser, checkInterior, checkUser } from '../middleware/use
 import { getMySqlMs, randomId } from '../tools/system';
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from '../config/enum/dbEnum';
 import { changeEnumValue } from '../util/verificationEnum';
-import { DEGREE, FUHUASTATE, ZZMM } from '../config/enum/enum';
+import { DEGREE, FUHUASTATE, IPRALLTYPE, ZZMM } from '../config/enum/enum';
 import { operationalData } from '../data/operationalData';
 const xlsx = require('node-xlsx');
 const path = require('path');
@@ -222,7 +222,7 @@ export async function data1210(req, res) {
                 eId,
                 year:getMySqlMs("2022-01-01 00:00:00"),
                 number:subList[31],
-                iprType:0,
+                iprType:IPRALLTYPE.软件著作权,
                 selectedValue:null,
                 iprName:null,
                 iprUrl:null,
@@ -241,7 +241,7 @@ export async function data1210(req, res) {
                 eId,
                 year:getMySqlMs("2023-01-01 00:00:00"),
                 number:subList[32],
-                iprType:0,
+                iprType:IPRALLTYPE.软件著作权,
                 selectedValue:null,
                 iprName:null,
                 iprUrl:null,

src/routers/public.ts

@@ -22,7 +22,7 @@ const config = {
     "/public/output/enterprisefinancing":outputEnumConfig.ENTERPRISEFINANCING,
     "/public/output/enterprisetalent":outputEnumConfig.ENTERPRISETALENT,
     "/public/output/enterpriseservice":outputEnumConfig.ENTERPRISESERVICE,
-
+    "/public/output/enterprisemoveout":outputEnumConfig.ENTERPRISEBASEMOVEOUT,
     "/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
     "/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利