no message

serverConfig.xml

 <config>
     <port>9098</port>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
-    <dbServer>http://192.168.0.105:9096</dbServer>
-    <imgUrl>http://192.168.0.105:9098</imgUrl>
-    <imgFileUrl>http://192.168.0.105:9097</imgFileUrl>
+    <dbServer>http://192.168.0.71:9096</dbServer>
+    <imgUrl>http://192.168.0.72:9098</imgUrl>
+    <imgFileUrl>http://192.168.0.72:9097</imgFileUrl>
      <qcc>
         <key>2b14555ce89346e8b96684e2e2a1c7c2</key>
         <SecretKey>452AAE887A1CDCAB8C9D730BA8B8FBF0</SecretKey>

src/biz/fuhua.ts

@@ -4,7 +4,7 @@
 
 import moment = require("moment");
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
-import { EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, STATE } from "../config/enum/enum";
+import { CHANGETYPE, EMIGRATIONTYPE, FUHUASTATE, INCOME, INDUSTRY, STATE } from "../config/enum/enum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { getMySqlMs, randomId } from "../tools/system";
 import { changeEnumValue } from "../util/verificationEnum";
@@ -340,144 +340,6 @@ export async function getWorthDate() {
 
 // ============================== 管理后台操作 ======================================
 /**
- * 添加入孵企业
- */
- export async function createRuFu(param) {
-    const FuncName = "管理员添加入孵企业"
-    eccFormParam(FuncName, AdminRegisterAddConfig, param );
-
-
-    let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone:param.phone}, ["uId"]);
-    if (userInfo && userInfo.uId) throw new BizError(ERRORENUM.手机号码重复);
-
-    // 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.企业已存在);
-    }
-    
-    let addEInfo = {
-        eId:randomId(TABLEID.企业基础信息表),
-        enterpriseName:param.enterpriseName,
-        uscc:param.uscc,
-        logonTime:getMySqlMs(param.logonTime),
-        logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
-        mail:param.mail,//邮箱
-        state:0,
-        register:0
-    };
-    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
-
-    let addUInfo = {
-        eId:addEInfo.eId,
-        uId:randomId(TABLEID.企业用户表),
-        phone:param.phone,
-        pwd:param.pwd,
-        userName:param.userName
-    };
-    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业用户表, addUInfo, {});
-
-
-    let fuHuaInfo = {
-        eId:addEInfo.eId,
-        fId:randomId(TABLEID.企业孵化信息),
-        startTime:getMySqlMs(param.fuHuaTimeStart),
-        endTime:getMySqlMs(param.fuHuaTimeEndTime),
-        state:0,
-    };
-    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业孵化信息, fuHuaInfo, {});
-
-    let leaseInfo = {
-        eId:addEInfo.eId,
-        leaseId:randomId(TABLEID.租赁信息),
-        area:param.area,
-        unitPrice:param.unitPrice,
-        buillding: param.building|| null, // 楼号
-        roomNumber:param.roomNumber,
-        // startTime:getMySqlMs(param.fuHuaTimeStart), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化开始时间
-        // endTime:getMySqlMs(param.fuHuaTimeEndTime), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化结束时间
-        startTime: getMySqlMs(param.leaseStartTime),  // 租赁开始时间
-        endTime: getMySqlMs(param.leaseEndTime),      // 租赁结束时间
-        rent:param.rent,
-    }
-    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
-
-
-
-   
-    return {isSuccess:true};
-}
-
-
-/**
- * 入孵材料回显
- * @param eId 
- * @returns 
- */
-export async function getRuFu(eId:string) {
-    let filesList = ["eId", "uscc", "enterpriseName", "logonAddress", "logonTime"];
-    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
-    if (!enterpriseUserInfo || !enterpriseUserInfo.eId) {
-        throw new BizError(ERRORENUM.请先申请入孵);
-    }
-    let leaseFilesList = ["leaseId", "area", "leaseContract", "entryPlan", "businessLicense", "agreement"];
-    let leaseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.租赁信息, {eId}, leaseFilesList);
-    enterpriseUserInfo.logonAddress = JSON.parse(enterpriseUserInfo.logonAddress);
-
-    let zaifuList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业孵化信息, {eId}, ["startTime", "endTime"]);
-    let dataInfo:any = extractData(EnterpriseApplyForConfig, enterpriseUserInfo);
-
-    dataInfo.logonTime = moment(enterpriseUserInfo.logonTime).format("YYYY-MM-DD");
-    if (zaifuList.startTime) dataInfo.startTime = new Date(zaifuList.startTime).valueOf(); //孵化开始时间
-    else dataInfo.startTime = "";
-    if (zaifuList.endTime) dataInfo.endTime = new Date(zaifuList.endTime).valueOf(); //孵化结束时间
-    else dataInfo.endTime = "";
-    // if (zaifuList.startTime || zaifuList.endTime) dataInfo.leaseTime = `${moment(zaifuList.startTime).format("YYYY-MM-DD")}至${moment(zaifuList.endTime).format("YYYY-MM-DD")}`;
-    
-    dataInfo.area = leaseInfo.area;
-
-    dataInfo.leaseContract = leaseInfo.leaseContract;
-    dataInfo.entryPlan = leaseInfo.entryPlan;
-    dataInfo.businessLicense = leaseInfo.businessLicense;
-    dataInfo.agreement = leaseInfo.agreement;
-
-    dataInfo.leaseContractModelUrl = "/yuyi/files/房屋租赁合同模板.docx";
-    dataInfo.entryPlanModelUrl = "/yuyi/files/孵化企业入驻计划.xlsx";
-    dataInfo.businessLicenseUrl = "/yuyi/files/营业执照复印件.docx";
-    dataInfo.agreementModelUrl = "/yuyi/files/孵化协议模板.docx";
-
-    return {dataInfo};
-}
-
-
-/**
- * 编辑入孵材料
- * @param eId 
- * @param param 
- * @returns 
- */
-export async function updateRuFu(eId:string, param) {
-    const FuncName = "管理员修改入驻信息";
-    eccFormParam(FuncName, AdminRegisterUpdateConfig, param );
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
-    let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
-    if (!resInfo || !resInfo.eId) {
-        throw new BizError(ERRORENUM.数据不存在);
-    }
-    if (resInfo.state == 1) {
-        throw new BizError(ERRORENUM.已审核请前往小程序登录)
-    } 
-
-    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, param, {eId});
-
-    return {isSuccess:true};
-}
-
-
-/**
  * 雨艺孵化器数据回显
  */
 export async function getYuYiFuHua() {

src/config/enum/dbEnum.ts

@@ -37,7 +37,8 @@ export enum TABLENAME {
     企业服务表 ='enterprise_service',
     企业基础信息表 ='enterprise',
     政策表 = 'policy',
-    管理后台用户 = 'adminUser'
+    管理后台用户 = 'adminUser',
+    入孵申请审批表 ='approval_history',
     
 }
 
@@ -60,5 +61,6 @@ export enum TABLEID {
     企业服务表 ='es',
     企业基础信息表 ='e',
     图片存储='img',
-    政策表 = 'zc'
+    政策表 = 'zc',
+    入孵申请审批表 = 'ah'
 } 
\ No newline at end of file

src/config/enum/enum.ts

@@ -174,22 +174,22 @@ export enum STATE {
 
 
 /**
- * 入孵申请
+ * 入孵申请审批历史-审批状态
  */
-export enum REGISTER {
-    否 = 0,//未审核
-    是 = 1,//已通过
-    已驳回 = 2
+export enum CHANGESTATE {
+    未审核 = 0,//未审核
+    已通过 = 1,//已通过
+    已驳回 = 2,
+    重新提交
 }
 
 
 /**
- * 入孵材料审核
+ * 入孵申请审批历史-审批类型
  */
-export enum RUFICAILIAOSTATE {
-    否 = 0,
-    是,
-    已驳回,
+export enum CHANGETYPE {
+    入孵申请 = 1,
+    入孵材料审批 = 2
 }
 
 

src/routers/admin.ts

@@ -24,6 +24,9 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/settlein/pass', checkUser, asyncHandler(settleInPass));
     httpServer.post('/admin/enterprise/settlein/update', checkUser, asyncHandler(settleUpdate));
     httpServer.post('/admin/enterprise/settlein/out', checkUser, asyncHandler(settleInOut));
+    httpServer.post('/admin/fuhua/rufu/add', checkUser, asyncHandler(addRuFu));
+    httpServer.post('/admin/fuhua/rufu/info', checkUser, asyncHandler(getRuFu));
+    httpServer.post('/admin/fuhua/rufu/update', checkUser, asyncHandler(updateRuFu));//
     //审核
     httpServer.post('/admin/enterprise/settlein/examine/list', checkUser, asyncHandler(examineSettleIn));
     httpServer.post('/admin/enterprise/settlein/examine/pass', checkUser, asyncHandler(examineSettleInPass));//入孵材料审核 通过
@@ -763,6 +766,45 @@ async function settleInOut(req, res) {
 
 
 /**
+ * 添加入孵企业
+ * @param req 
+ * @param res 
+ */
+async function addRuFu(req, res) {
+    let { param } = req.body;
+    let result = await ruFuBiz.createRuFu(param);
+
+    res.success(result);
+}
+
+
+/**
+ * 企业入孵材料回显
+ * @param req 
+ * @param res 
+ */
+async function getRuFu(req, res) {
+    let { eId } = req.body
+    let result = await ruFuBiz.getRuFu(eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 管理员编辑企业材料
+ * @param req 
+ * @param res 
+ */
+async function updateRuFu(req, res) {
+    let { eId, param } = req.body
+    let result = await ruFuBiz.updateRuFu(eId, param);
+
+    res.success(result);
+}
+
+
+/**
  * 
  * @param req 
  * @param res 

src/routers/fuhua.ts

@@ -10,9 +10,6 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/fuhua/operate', checkUser, asyncHandler(operateData));
     httpServer.post('/admin/fuhua/risk', checkUser, asyncHandler(riskData));
     httpServer.post('/admin/fuhua/worth', checkUser, asyncHandler(worthDate));
-    httpServer.post('/admin/fuhua/rufu/add', checkUser, asyncHandler(addRuFu));
-    httpServer.post('/admin/fuhua/rufu/info', checkUser, asyncHandler(getRuFu));
-    httpServer.post('/admin/fuhua/rufu/update', checkUser, asyncHandler(updateRuFu));//
     httpServer.post('/admin/fuhua/yuyi/info', checkUser, asyncHandler(yuYiRuFu));
     httpServer.post('/admin/fuhua/yuyi/update', checkUser, asyncHandler(updateYuYi));
 }
@@ -68,45 +65,6 @@ async function worthDate(req, res) {
 
 
 /**
- * 添加入孵企业
- * @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) {