no message

src/biz/admin.ts

@@ -162,7 +162,7 @@ export async function settleInEnterpriseList(page:number, entepriseName:string)
     let selectParam:any = {state:enumConfig.STATE.否, register:enumConfig.STATE.否};
     if (entepriseName) selectParam.enterpriseName = {"%like%":entepriseName};
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
 
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
@@ -185,7 +185,8 @@ export async function settleInEnterpriseList(page:number, entepriseName:string)
             area:info.enterprise_leases[0].area,
             unitPrice:info.enterprise_leases[0].unitPrice,
             roomNumber:info.enterprise_leases[0].roomNumber,
-            rent:info.enterprise_leases[0].rent
+            rent:info.enterprise_leases[0].rent,
+            logonAddress:changeAdd(JSON.parse(info.logonAddress))
         });
     });
 
@@ -225,7 +226,8 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
     let updateInfo = {
         enterpriseName:param.enterpriseName,
         uscc:param.uscc,
-        logonTime:param.logonTime
+        logonTime:param.logonTime,
+        logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
     
@@ -819,3 +821,9 @@ export async function enterpriseRegisterExamineOut(eId:string) {
 
     return {isSuccess:true};
 }
+
+
+
+
+
+

src/config/eccParam/enterprise.ts

@@ -36,6 +36,7 @@ export const SettleInForUpdateConfig = {
     enterpriseName:{type:"String"},
     uscc:{type:"String"},//信用代码
     logonTime:{type:"Number"},//注册时间
+    logonAddress:{type:"String"},//注册地址
     fuHuaTimeStart:{type:"Number"},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
     area:{type:"Number"},//面积
@@ -52,4 +53,53 @@ export const RegisterUpdateConfig = {
     leaseTimeEnd:{type:"Number"},//租赁结束时间
     logonTime:{type:"Number"},//注册时间
     area:{type:"Number"},//面积
-}
+}
\ No newline at end of file
+
+export const AdminRegisterAddConfig = {
+    // enterpriseName:{type:"String"},//企业名称
+    // uscc:{type:"String"},//统一信用代码
+    // logonTime:{type:"Number"},//注册日期
+    // logonAddress:{type:"String"},//注册地址
+    // fuHuaTimeStart:{type:"Number"},//孵化开始时间
+    // fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
+    // area:{type:"Number"},//面积
+    enterpriseName:{type:"String"},
+    uscc:{type:"String"},//信用代码
+    logonTime:{type:"Number"},//注册时间
+    logonAddress:{type:"String"},//注册地址
+    fuHuaTimeStart:{type:"Number"},//孵化开始时间
+    fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
+    area:{type:"Number"},//面积
+    unitPrice:{type:"Number"},//单价
+    roomNumber:{type:"String"},//室号
+    rent:{type:"Number"},//总价
+}
+
+
+export const AdminRegisterUpdateConfig = {
+    leaseContract:{type:"String"},// 房屋租赁合同链接
+    entryPlan:{type:"String"},// 入驻计划复印件链接
+    businessLicense:{type:"String"},// 营业执照复印件链接
+    agreement:{type:"String"},// 孵化协议链接
+}
+
+
+export const YuYiBaseDataUpdateConfig = {
+    operateName:{type:"String"},//运营名称
+    name:{type:"String"},//孵化器名称
+    registerTime:{type:"String"},//注册时间
+    incubateLv:{type:"String"},//孵化级别
+    incubateTime:{type:"String"},//孵化器认定时间
+    incubateField:{type:"String"},//孵化领域
+    natureInstitution:{type:"String"},//机构性质
+    contacts:{type:"String"},//联系人
+    personCharge:{type:"String"},//负责人
+    phone:{type:"String"},//手机号码
+    synopsis:{type:"String"},//简介
+    totalArea:{type:"String"},//总面积
+    zaifuArea:{type:"String"},//在孵面积
+    ziyonArea:{type:"String"},//自用面积
+}
+
+
+

src/config/enum/dbEnum.ts

@@ -19,6 +19,7 @@ export enum OPERATIONALDATATYPE {
  * 表名
  */
 export enum TABLENAME {
+    羽翼孵化器信息='system_yuyi',
     企业孵化信息='enterprise_fuhua',
     租赁信息='enterprise_lease',
     企业用户表='enterprise_user',
@@ -41,6 +42,7 @@ export enum TABLENAME {
 }
 
 export enum TABLEID {
+    羽翼孵化器信息='yy',
     企业孵化信息='fh',
     租赁信息='le',
     企业用户表='ur',

src/config/enum/enum.ts

@@ -15,6 +15,20 @@ export enum INDUSTRY{
 
 
 /**
+ * 孵化器看板使用
+ * 孵化器收入
+ */
+export enum INCOME {
+    综合收入 = 1,
+    投资收入,
+    房租收入,
+    财政补贴,
+    其他收入,
+}
+
+
+
+/**
  * 最高学历
  */
 export enum DEGREE {

src/config/splitResult/enterprise.ts

@@ -17,3 +17,23 @@ export const EnterpriseApplyForConfig = {
 }
 
 
+export const YuYiBaseDataConfig = {
+   yId:{key:"标识"},
+   operateName:{key:"运营名称"},
+   name:{key:"孵化器名称"},
+   uscc:{key:"统一社会信用代码"},
+   registerTime:{key:"注册时间"},
+   incubateLv:{key:"孵化级别"},
+   incubateTime:{key:"孵化器认定时间"},
+   incubateField:{key:"孵化领域"},
+   natureInstitution:{key:"机构性质"},
+   contacts:{key:"联系人"},
+   personCharge:{key:"负责人"},
+   phone:{key:"手机号码"},
+   synopsis:{key:"简介"},
+   totalArea:{key:"总面积"},
+   zaifuArea:{key:"在孵面积"},
+   ziyonArea:{key:"自用面积"},
+}
+
+

src/routers/fuhua.ts

+import { checkUser } from "../middleware/user";
+import * as asyncHandler from 'express-async-handler';
+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/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/yuyi/info', asyncHandler(yuYiRuFu));
+    httpServer.post('/admin/fuhua/yuyi/update', asyncHandler(updateYuYi));
+}
+
+
+/**
+ * 孵化器看板基本信息
+ * @param req 
+ * @param res 
+ */
+async function baseData(req, res) {
+    let result = await fuhuaBiz.getBaseData();
+
+    res.success(result);
+}
+
+
+/**
+ * 运营分析
+ * @param req 
+ * @param res 
+ */
+async function operateData(req, res) {
+    let {year} = req.body;
+    let result = await fuhuaBiz.getOperateData(year);
+
+    res.success(result);
+}
+
+
+/**
+ * 风险预警
+ * @param req 
+ * @param res 
+ */
+async function riskData(req, res) {
+    let result = await fuhuaBiz.getRiskData();
+
+    res.success(result);
+}
+
+
+/**
+ * 价值分析
+ * @param req 
+ * @param res 
+ */
+async function worthDate(req, res) {
+    let result = await fuhuaBiz.getWorthDate();
+
+    res.success(result);
+}
+
+
+/**
+ * 添加入孵企业
+ * @param req 
+ * @param res 
+ */
+async function addRuFu(req, res) {
+    let { param } = req.body;
+    let result = await fuhuaBiz.createRuFu(param);
+
+    res.success(result);
+}
+
+
+/**
+ * 企业入孵材料回显
+ * @param req 
+ * @param res 
+ */
+async function getRuFu(req, res) {
+    let { eId } = req.body
+    let result = await fuhuaBiz.getRuFu(eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 管理员编辑企业材料
+ * @param req 
+ * @param res 
+ */
+async function updateRuFu(req, res) {
+    let { eId, param } = req.body
+    let result = await fuhuaBiz.updateRuFu(eId, param);
+
+    res.success(result);
+}
+
+
+/**
+ * 雨艺孵化器基本信息回显
+ */
+async function yuYiRuFu(req, res) {
+    let result = await fuhuaBiz.getYuYiFuHua();
+
+    res.success(result);
+}
+
+
+
+async function updateYuYi(req, res) {
+    let { yId, param } = req.body
+    let result = await fuhuaBiz.updateYuYi(yId, param);
+
+    res.success(result);
+}
+
+
+

src/routers/router.ts

@@ -4,6 +4,7 @@
 
 import * as publicRouters from './public';
 import * as enterpriseInfoRouters from './admin';
+import * as fuhuaRouters from './fuhua';
 import * as dbInitRouters from './dbinit';
 export function setRouter(httpServer){
     /**下拉框等公用 路由 */
@@ -11,6 +12,7 @@ export function setRouter(httpServer){
     
     /**小程序企业端 入口路由 */
     enterpriseInfoRouters.setRouter(httpServer);
+    fuhuaRouters.setRouter(httpServer);
 
     dbInitRouters.setRouter(httpServer);
 }
\ No newline at end of file