no message

serverConfig.xml

 <config>
     <port>9098</port>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
-    <dbServer>http://192.168.0.105:40012</dbServer>
+    <dbServer>http://127.0.0.1:9096</dbServer>
+    <imgUrl>http://127.0.0.1:9098</imgUrl>
+    <imgFileUrl>http://192.168.0.189:9097</imgFileUrl>
 </config>
\ No newline at end of file

src/biz/fuhua.ts

@@ -338,8 +338,11 @@ export async function getWorthDate() {
     if (userInfo && userInfo.uId) throw new BizError(ERRORENUM.手机号码重复);
 
 
-    let filesList = ["eId"];
+    // let filesList = ["eId"];
+    let filesList = ["eId", "uscc"];
     let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
+    // console.log("查询结果:", enterpriseUserInfo); // 添加日志
+
     if (enterpriseUserInfo && enterpriseUserInfo.eId) {
         throw new BizError(ERRORENUM.企业已存在);
     }

src/biz/ruFu.ts

@@ -25,7 +25,7 @@ export async function settleInEnterpriseList(page:number, entepriseName:string)
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
 
     let manyTableInfo:any = {}
-    manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
+    manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent", "totalPrice"], where:{} };
     manyTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{} };
     manyTableInfo[TABLENAME.企业用户表] = {column:["userName", "pwd", "phone", "uId"], where:{} };
     let resList = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
@@ -52,6 +52,7 @@ export async function settleInEnterpriseList(page:number, entepriseName:string)
             pwd:info.enterprise_users[0].pwd,
             phone:info.enterprise_users[0].phone,
             uId:info.enterprise_users[0].uId,
+            totalPrice: info.enterprise_leases[0].totalPrice // 添加年总价字段
         });
     });
 
@@ -107,8 +108,11 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
 
     let leaseInfo = {
         area:param.area,
-        unitPrice:param.unitPrice,
-        roomNumber:param.roomNumber,
+        // unitPrice:param.unitPrice,
+        // unitPrice:param.rent / param.area,// 计算单价
+
+        //如果 param.rent 和 param.area 都存在且不为零，则计算 unitPrice 为 param.rent 除以 param.area；否则，直接使用 param.unitPrice。
+        unitPrice: param.rent && param.area ? param.rent / param.area : param.unitPrice, 
         rent:param.rent,
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, leaseInfo, {eId});
@@ -229,7 +233,8 @@ export async function enterpriseRegister(param) {
         uscc:param.uscc,
         logonTime:getMySqlMs(param.logonTime),
         state:0,
-        register:0
+        register:0,
+        rent: param.rent
     };
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
 
@@ -245,6 +250,7 @@ export async function enterpriseRegister(param) {
         startTime:getMySqlMs(param.leaseTimeStart),
         endTime:getMySqlMs(param.leaseTimeEnd),
         area:param.area
+
     }
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
    

src/biz/zhengCe.ts

@@ -15,19 +15,41 @@ import { PolicyUpdateConfig } from "../config/eccParam/enterprise";
 export async function enterprisePolicyList(keywords:string, page:number) {
     let selectParam:any = {};
     if (keywords) selectParam.desc = {"%like%":keywords};
-    let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "isPermanent"];
+    let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "isPermanent","coverImg"];
     let resList = await selectData(OPERATIONALDATATYPE.分页查询, TABLENAME.政策表, selectParam, filesList, page);
     let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.政策表, selectParam, null);
 
     let dataList = []; 
+    const now = moment().valueOf(); // 获取当前时间戳
     resList.forEach(info => {
+        let closeTimeMs = info.closeTimeMs;
+        if (info.isPermanent == 1) closeTimeMs = '永久有效';
+        if (!info.closeTimeMs) closeTimeMs = "-";
+
+        // 格式化日期前检查closeTimeMs是否为'永久有效'或'-'
+        let formattedCloseTimeMs = closeTimeMs === '永久有效' || closeTimeMs === '-' ? closeTimeMs : moment(closeTimeMs).format("YYYY-MM-DD");
+
+        // 判断政策是进行中还是往期
+        let status = '';
+        if (info.isPermanent == 1) {
+            status = '进行中';
+        } else if (closeTimeMs === '-') {
+            status = '进行中';
+        } else {
+            const policyEndTime = moment(closeTimeMs).valueOf();
+            status = policyEndTime >= now ? '进行中' : '往期';
+        }
+
         dataList.push({
             poId:info.poId,
             title:info.title,
             source:info.source,
             createTimeMs:info.createTimeMs,
-            closeTimeMs:info.closeTimeMs ? info.closeTimeMs : "-",
-            isPermanent:info.isPermanent
+            closeTimeMs:formattedCloseTimeMs,
+            isPermanent: info.isPermanent,
+            //图片
+            coverImg:JSON.parse(info.coverImg),
+            //coverImg:info.coverImg ?  JSON.parse(info.coverImg) : [],
         });
     });
 
@@ -74,8 +96,8 @@ export async function enterprisePolicyAdd( param) {
     eccFormParam(FuncName, PolicyUpdateConfig, param );
   
     if (param.closeTimeMs) param.closeTimeMs = getMySqlMs(param.closeTimeMs);
-    param.createTimeMs = getMySqlMs();
-    if (!param.coverImg) param.coverImg = '[]';
+    // param.createTimeMs = getMySqlMs(); //没有传时间不能调用格式转换方法，会默认时间1970-01-01
+    if (!param.coverImg.length) param.coverImg =  "[\"/yuyi/files/默认图片.png\"]";
     else param.coverImg = JSON.stringify(param.coverImg);
     param.poId = randomId(TABLEID.政策表);
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.政策表, param, {});

src/config/eccParam/enterprise.ts

@@ -40,9 +40,10 @@ export const SettleInForUpdateConfig = {
     fuHuaTimeStart:{type:"Number"},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
     area:{type:"Number"},//面积
-    unitPrice:{type:"Number"},//单价
+    // unitPrice:{type:"Number"},//单价
     roomNumber:{type:"String"},//室号
-    rent:{type:"Number"},//总价
+    rent:{type:"Number"},//每月租金
+    // totalPrice:{type:"Number"},//总价
     pwd:{type:"String"},
     phone:{type:"String"},
     userName:{type:"String"},
@@ -74,9 +75,10 @@ export const AdminRegisterAddConfig = {
     fuHuaTimeStart:{type:"Number"},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
     area:{type:"Number"},//面积
-    unitPrice:{type:"Number"},//单价
+    // unitPrice:{type:"Number"},//单价
     roomNumber:{type:"String"},//室号
-    rent:{type:"Number"},//总价
+    rent:{type:"Number"},//每月租金
+    // totalPrice:{type:"Number"},//总价
     pwd:{type:"String"},
     phone:{type:"String"},
     userName:{type:"String"}

src/config/enum/enum.ts

@@ -118,7 +118,9 @@ export enum FOLLOWUPSTATUS {
  * 服务类别
  */
 export enum NEEDCATEGORY {
-    物业服务 = 1,
+    // 物业服务 = 1,
+    工商税务 = 1,
+    代理记账,
     贷款服务,
     法律服务,
     知识产权,
@@ -153,4 +155,51 @@ export enum FINANCINGROUNDS {
 export enum STATE {
     否 = 0,
     是
-}
+}
\ No newline at end of file
+
+
+export enum QUARTER {
+    第一季度 = 1,
+    第二季度,
+    第三季度,
+    第四季度
+}
+
+
+
+/**
+ * 知识产权类型
+ */
+export enum INTELLECTUALPROPERTYRIGHT {
+    软件著作 = 1,
+    发明专利,
+    海外专利,
+    植物新品种,
+    集成电路布图,
+}
+
+
+
+/**
+ * 知识产权及专利
+ */
+export enum IPROPERTYTYPE {
+    软件著作个数 = 1,
+    发明专利个数,
+    海外专利个数,
+    植物新品种个数,
+    集成电路布图个数
+}
+
+
+/**
+ * 前端用
+ */
+export enum INTELLECTUALPROPERTYRIGHT {
+    softwareCopyright = 1,
+    inventionPatent,
+    overseasPatent,
+    plantVariety,
+    icLayout
+}
+

src/config/enum/outputEnum.ts

@@ -18,8 +18,8 @@ export enum ENTERPRISEMANAGE {
     "营收（万元）" = "BI",
     "纳税（万元）" = "TXP",
     "研发投入（万元）" = "RD",
-    年度 = "annual",
-    状态 = "state"
+    季度 = "annual",
+    // 状态 = "state"
 }
 
 export enum ENTERPRISEFINANCING {
@@ -39,3 +39,15 @@ export enum ENTERPRISETALENT {
     毕业学校 = "graduationSchool",
     企业名称 = "enterpriseName"
 }
+
+/**企业服务 */
+export enum ENTERPRISESERVICE {
+    企业名称="enterpriseName",
+    需求类别="needCategory",
+    申请时间="applyTime",
+    跟进状态="followUpStatus",
+    解决时间="resolveTime",
+    需求内容="needContent"
+}
+
+

src/config/serverConfig.ts

@@ -16,11 +16,14 @@ export async function initConfig() {
 		if (!configInfo || !configInfo.config) throw new BizError('xml中无配置');
 		else {
             
-            let {port, sign, dbServer } = configInfo.config;
+            let {port, sign, dbServer, imgUrl, imgFileUrl } = configInfo.config;
             systemConfig.port = parseInt(port[0]);
 
-            systemConfig.dbSign = sign[0]
-            systemConfig.dbPath = dbServer[0]
+            systemConfig.dbSign = sign[0];
+            systemConfig.dbPath = dbServer[0];
+            
+            systemConfig.imgUrl = imgUrl[0];
+            systemConfig.imgFileUrl = imgFileUrl[0];
 
 		}
         

src/config/systemClass.ts

@@ -8,4 +8,6 @@ export class ServerConfig {
     port:number;
     dbSign:String;
     dbPath:String;
+    imgUrl:String;
+    imgFileUrl:String;
 }
\ No newline at end of file

src/net/http_server.ts

@@ -32,6 +32,7 @@ export class httpServer {
 
         httpServer.use(express.static("./static") );
         httpServer.use(express.static("./files") );
+        httpServer.use(express.static("./img") );
         const root = path.join(__dirname, "../../public");
         httpServer.use(express.static(root));
         httpServer.use(fallback('index.html', { root }));

src/routers/admin.ts

@@ -11,6 +11,8 @@ import * as zhengCeBiz from '../biz/zhengCe';
 import * as fuWuBiz from '../biz/fuWu';
 import * as ruFuBiz from '../biz/ruFu';
 import { checkEnterpriseUser, checkUser } from '../middleware/user';
+import { ERRORENUM } from '../config/enum/errorEnum';
+import { BizError } from '../util/bizError';
 
 export function setRouter(httpServer) {
     //管理员登录登出
@@ -48,7 +50,11 @@ export function setRouter(httpServer) {
     // 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/dw/enterprise/list', checkUser, asyncHandler(dwEnterpriseList));//下载
+    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));//单企业融资情况下载
+    
     httpServer.post('/admin/library/manage/list', checkUser, asyncHandler(manageList));
     httpServer.post('/admin/library/dw/manage/list', checkUser, asyncHandler(outPutManageList));
     
@@ -86,6 +92,8 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/register', asyncHandler(enterpriseLogon));
 
     httpServer.post('/admin/library/ipr/list', checkUser, asyncHandler(iprList));
+    httpServer.post('/admin/library/ipr/details', checkUser, asyncHandler(iprDetails));
+
     httpServer.post('/admin/library/qualification/list', checkUser, asyncHandler(qualificationList));
     httpServer.post('/admin/library/honor/list', checkUser, asyncHandler(enterpriseHonor));
 
@@ -99,6 +107,17 @@ async function iprList(req, res) {
     res.success(result);
 }
 
+async function iprDetails(req, res) {
+    const UserInfo = req.userInfo;
+    let { eId } = req.body
+    let result = await enterpriseInfoBiz.getiprDetails(eId);
+
+    res.success(result);
+}
+
+
+
+
 async function qualificationList(req, res) {
     const UserInfo = req.userInfo;
     let { entepriseName, page } = req.body
@@ -378,7 +397,7 @@ async function enterpriseDetails(req, res) {
 
 
 /**
- * 
+ * 下载
  * @param req 
  * @param res 
  */
@@ -391,6 +410,57 @@ async function dwEnterpriseList(req, res) {
 
 
 /**
+ * 在孵企业下载
+ * @param req 
+ * @param res 
+ */
+async function getAllDwOutPutData(req, res) {
+    let {eId} = req.body
+
+    let result = await zaiFuBiz.getAllDwOutPut(eId);
+
+    res.success(result);
+}
+
+
+// /**
+//  * 单企业基本信息下载
+//  * @param req 
+//  * @param res 
+//  */
+// async function dwBasicInformationList(req, res) {
+//     let {eId} = req.body
+//     let result = await zaiFuBiz.dwBasicInformation(eId);//基本信息下载
+
+//     res.success(result);
+// }
+
+/**
+ * 单企业经营数据下载
+ * @param req 
+ * @param res 
+ */
+async function dwBusinessDataList(req, res) {
+    let {eId} = req.body
+    let result = await zaiFuBiz.dwBusinessData(eId);
+
+    res.success(result);
+}
+
+/**
+ * 单企业融资情况下载
+ * @param req 
+ * @param res 
+ */
+async function dwFinancingSituationeList(req, res) {
+    let {eId} = req.body
+    let result = await zaiFuBiz.dwFinancingSituatione(eId);
+
+    res.success(result);
+}
+
+
+/**
  * 
  * @param req 
  * @param res 
@@ -405,8 +475,8 @@ async function manageList(req, res) {
 
 async function outPutManageList(req, res) {
     const UserInfo = req.userInfo;
-    let {entepriseName, year, type, state, files } = req.body
-    let result = await enterpriseInfoBiz.outPutEnterpriseManageList(entepriseName, year, state, type, files);
+    let {entepriseName, year, type, files } = req.body
+    let result = await enterpriseInfoBiz.outPutEnterpriseManageList(entepriseName, year, type, files);
 
     res.success(result);
 }
@@ -417,9 +487,9 @@ async function outPutManageList(req, res) {
 async function managePass(req, res) {
     const UserInfo = req.userInfo;
     let {mId } = req.body
-    let result = await enterpriseInfoBiz.enterpriseManagePass(mId);
+    // let result = await enterpriseInfoBiz.enterpriseManagePass(mId);
 
-    res.success(result);
+    // res.success(result);
 }
 
 
@@ -430,8 +500,8 @@ async function managePass(req, res) {
  */
 async function financingList(req, res) {
     const UserInfo = req.userInfo;
-    let {entepriseName, page } = req.body
-    let result = await enterpriseInfoBiz.enterpriseFinancingList(entepriseName, page);
+    let {entepriseName, year, page} = req.body
+    let result = await enterpriseInfoBiz.enterpriseFinancingList(entepriseName, year, page);
 
     res.success(result);
 }
@@ -457,8 +527,8 @@ async function financingAllYear(req, res) {
  */
 async function outPutFinancingList(req, res) {
     const UserInfo = req.userInfo;
-    let {entepriseName, type, files } = req.body
-    let result = await enterpriseInfoBiz.outPutEnterpriseFinancingList(entepriseName, type, files);
+    let {entepriseName, year, type, files } = req.body
+    let result = await enterpriseInfoBiz.outPutEnterpriseFinancingList(entepriseName, year, type, files);
 
     res.success(result);
 }
@@ -485,11 +555,11 @@ async function examineList(req, res) {
  * @param res 
  */
 async function examineSub(req, res) {
-    const UserInfo = req.userInfo;
-    let { mId } = req.body
-    let result = await enterpriseInfoBiz.enterpriseExaminePass(mId);
+    // const UserInfo = req.userInfo;
+    // let { mId } = req.body
+    // let result = await enterpriseInfoBiz.enterpriseExaminePass(mId);
 
-    res.success(result);
+    // res.success(result);
 }
 
 

src/routers/public.ts

@@ -21,6 +21,14 @@ const config = {
     "/public/output/enterprisemanage":outputEnumConfig.ENTERPRISEMANAGE,
     "/public/output/enterprisefinancing":outputEnumConfig.ENTERPRISEFINANCING,
     "/public/output/enterprisetalent":outputEnumConfig.ENTERPRISETALENT,
+    "/public/output/enterpriseservice":outputEnumConfig.ENTERPRISESERVICE,
+    "/public/output/ipropertytype":enumConfig.IPROPERTYTYPE,//知识产权及专利类型
+    
+    
+    // "/public/output/basedata":outputEnumConfig.BASEDATA,
+    // "/public/output/opreatdata":outputEnumConfig.OPERATIONDATA,
+    // "/public/output/financingdata":outputEnumConfig.FINANCINGDATA,
+    
 }
 
 export function setRouter(httpServer) {

src/tools/system.ts

@@ -72,6 +72,7 @@ export function randomId(tableName:string) {
 export function getMySqlMs(time?) {
     time = time || new Date().valueOf();
     return moment(time).format("YYYY-MM-DD HH:mm:ss");
+    // return moment(time).format("YYYY");
 }
 
 export function randomCode() {