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/biz/ruFu.ts

 /**
  * 新入孵
  */
-import { ApplyForUpdateConfig, GardenNoticeUpdateConfig, PolicyUpdateConfig, RegisterUpdateConfig, SettleInForUpdateConfig } from "../config/eccParam/enterprise";
+
+import { AdminRegisterAddConfig, AdminRegisterUpdateConfig, RegisterUpdateConfig, SettleInForUpdateConfig } from "../config/eccParam/enterprise";
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
 import * as enumConfig from "../config/enum/enum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
@@ -16,17 +17,91 @@ import { changeEnumValue } from "../util/verificationEnum";
 
 
 //=======================================================新入孵企业
+/**
+ * 添加入孵企业
+ */
+ 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, {});
+
+    let addInfo = {
+        approvalId: randomId(TABLEID.入孵申请审批表),
+        eId:addEInfo.eId,
+        changeType: enumConfig.CHANGETYPE.入孵申请,
+        changeState: enumConfig.CHANGESTATE.未审核,
+        createTimeMs: getMySqlMs()
+    }
+    await operationalData( OPERATIONALDATATYPE.增加, TABLENAME.入孵申请审批表, addInfo, {} );
+
+    return {isSuccess:true};
+}
 
 
 /**
- * 入孵申请
+ * 入孵申请列表
  * @param page 
  * @param enterpriseName 
  * @returns 
  */
 export async function settleInEnterpriseList(page:number, enterpriseName:string) {
-    // "%or%":[{"register":enumConfig.REGISTER.是}, {"register":enumConfig.REGISTER.否}]
-    let selectParam:any = {register:enumConfig.REGISTER.否, "%or%":[{"state":enumConfig.RUFICAILIAOSTATE.已驳回}, {"state":enumConfig.RUFICAILIAOSTATE.否}]};
+    // let selectParam:any = {register:enumConfig.REGISTER.否, "%or%":[{"state":enumConfig.RUFICAILIAOSTATE.已驳回}, {"state":enumConfig.RUFICAILIAOSTATE.否}]};
+    let selectParam:any = {register:enumConfig.STATE.否, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
@@ -35,6 +110,7 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent", "totalPrice"], where:{} };
     manyTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{} };
     manyTableInfo[TABLENAME.企业用户表] = {column:["userName", "pwd", "phone", "uId"], where:{} };
+    manyTableInfo[TABLENAME.入孵申请审批表] = {column:["approvalId", "changeState", "createTimeMs"], where:{"%literal%":`approval_histories.changeType = ${enumConfig.CHANGETYPE.入孵申请}`, "%limit%":1} };
     let resList = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
     let allResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["eId"], manyTableInfo );
     
@@ -64,14 +140,19 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
             phone:info.enterprise_users[0].phone,
             uId:info.enterprise_users[0].uId,
             totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段
-            status: info.register === enumConfig.REGISTER.已驳回 ? "已驳回" : "未审核" // 状态映射
-
+            status: info.approval_historys.changeState === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射 todo
         });
     });
     
     return {dataList, dataCount:allResList.length};
 }
 
+
+/**
+ * 入孵申请通过
+ * @param eId 
+ * @returns 
+ */
 export async function settleInEnterprisePass(eId:string) {
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
@@ -87,9 +168,64 @@ export async function settleInEnterprisePass(eId:string) {
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
 
+    let addInfo = {
+        approvalId: randomId(TABLEID.入孵申请审批表),
+        eId,
+        changeType: enumConfig.CHANGETYPE.入孵申请,
+        changeState: enumConfig.CHANGESTATE.已通过,
+        createTimeMs: getMySqlMs()
+    }
+    await operationalData( OPERATIONALDATATYPE.增加, TABLENAME.入孵申请审批表, addInfo, {} );
+
     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 = "";
+
+    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 settleInEnterpriseUpdate(eId:string, param) {
     const FuncName = "修改入驻信息";
     eccFormParam(FuncName, SettleInForUpdateConfig, param );
@@ -143,6 +279,11 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
 }
 
 
+/**
+ * 入孵申请驳回
+ * @param eId 
+ * @returns 
+ */
 export async function settleInEnterpriseOut(eId:string) {
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
@@ -157,12 +298,17 @@ export async function settleInEnterpriseOut(eId:string) {
     // await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.租赁信息, {}, {eId});
     // await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业基础信息表, {}, {eId});
 
-    await operationalData(
-        OPERATIONALDATATYPE.修改,
-        TABLENAME.企业基础信息表, 
-        { register: enumConfig.STATE.否, state: enumConfig.REGISTER.已驳回 },
-        { eId }
-    );
+    await operationalData( OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表,  {register: enumConfig.STATE.否 }, { eId });
+
+    let addInfo = {
+        approvalId: randomId(TABLEID.入孵申请审批表),
+        eId,
+        changeType: enumConfig.CHANGETYPE.入孵申请,
+        changeState: enumConfig.CHANGESTATE.已驳回,
+        createTimeMs: getMySqlMs()
+    }
+    await operationalData( OPERATIONALDATATYPE.增加, TABLENAME.入孵申请审批表, addInfo, {} );
+
     
     return {isSuccess:true};
 }
@@ -170,14 +316,15 @@ export async function settleInEnterpriseOut(eId:string) {
 
 
 /**
- * 入孵材料审核
+ * 入孵材料审核列表
  * @param enterpriseName 
  * @param page 
  * @returns 
  */
 export async function enterpriseRegisterExamineList(enterpriseName, page) {
     // let selectParam:any = {register:enumConfig.STATE.是, state:enumConfig.STATE.否};
-    let selectParam:any = {register:enumConfig.REGISTER.是, "%or%":[{"state":enumConfig.RUFICAILIAOSTATE.已驳回}, {"state":enumConfig.RUFICAILIAOSTATE.否}]};
+    // let selectParam:any = {register:enumConfig.STATE.是, "%or%":[{"state":enumConfig.RUFICAILIAOSTATE.已驳回}, {"state":enumConfig.RUFICAILIAOSTATE.否}]};
+    let selectParam:any = {register:enumConfig.STATE.是, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "randomCode", "state"];
@@ -185,6 +332,7 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["leaseContract", "entryPlan", "businessLicense", "agreement"], where:{} };
     manyTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{} };
+    manyTableInfo[TABLENAME.入孵申请审批表] = {column:["approvalId", "changeState", "createTimeMs"], where:{"%literal%":`approval_histories.changeType = ${enumConfig.CHANGETYPE.入孵材料审批}`, "%limit%":1} };
     let resList = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
     let allResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["eId"], manyTableInfo );
 
@@ -198,15 +346,20 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
             entryPlan:info.enterprise_leases[0].entryPlan || "未提交",
             businessLicense:info.enterprise_leases[0].businessLicense || "未提交",
             agreement:info.enterprise_leases[0].agreement || "未提交",
-            status: info.register === enumConfig.REGISTER.已驳回 ? "已驳回" : "未审核" // 状态映射
+            status: info.approval_historys.changeState === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射 todo
 
         });
     });
     
-
     return {dataList, dataCount:allResList.length};
 }
 
+
+/**
+ * 入孵材料审核通过
+ * @param eId 
+ * @returns 
+ */
 export async function enterpriseRegisterExaminePass(eId:string) {
     let manyTableInfo:any = {}
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
@@ -256,7 +409,7 @@ export async function enterpriseRegisterExaminePass(eId:string) {
 
 
 /**
- * 材料上传驳回
+ * 入孵材料审核驳回
  * @param eId 
  * @returns 
  */
@@ -277,19 +430,41 @@ export async function enterpriseRegisterExamineOut(eId:string) {
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, updateLeaseInfo, {eId});
 
-    let updateInfo = {
-        register:enumConfig.REGISTER.是,
-        state:enumConfig.RUFICAILIAOSTATE.已驳回,
-        // register:2
-    }
-    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, {state:enumConfig.STATE.否}, {eId});
     
     return {isSuccess:true};
 }
 
 
+/**
+ * 编辑入孵材料
+ * @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};
+}
 
 
+/**
+ * 企业注册-已弃用
+ * @param param 
+ * @returns 
+ */
 export async function enterpriseRegister(param) {
     const FuncName = "企业注册"
     eccFormParam(FuncName, RegisterUpdateConfig, param );
@@ -324,279 +499,10 @@ export async function enterpriseRegister(param) {
         startTime:getMySqlMs(param.leaseTimeStart),
         endTime:getMySqlMs(param.leaseTimeEnd),
         area:param.area
-
     }
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
    
     return {isSuccess:true};
 }
 
-/**
- * 备份
- */
-// /**
-//  * 新入孵
-//  */
-// import { ApplyForUpdateConfig, GardenNoticeUpdateConfig, PolicyUpdateConfig, RegisterUpdateConfig, SettleInForUpdateConfig } from "../config/eccParam/enterprise";
-// import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
-// import * as enumConfig from "../config/enum/enum";
-// import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
-// import { BizError } from "../util/bizError";
-// import { eccFormParam } from "../util/verificationParam";
-// import { ERRORENUM } from "../config/enum/errorEnum";
-// import { getMySqlMs, getToken, md5PwdStr, randomCode, randomId } from "../tools/system";
-// import moment = require("moment");
-// import { changeAdd, extractData } from "../util/piecemeal";
-// import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
-// import { changeEnumValue } from "../util/verificationEnum";
-
-
-// //=======================================================新入孵企业
-
-// export async function settleInEnterpriseList(page:number, enterpriseName:string) {
-
-//     let selectParam:any = {state:enumConfig.STATE.否, register:enumConfig.STATE.否};
-//     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
-
-//     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
-
-//     let manyTableInfo:any = {}
-//     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 );
-//     let allResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["eId"], manyTableInfo );
-
-//     let dataList = [];
-//     resList.forEach(info => {
-//         dataList.push({
-//             eId:info.eId,
-//             enterpriseName:info.enterpriseName,
-//             uscc:info.uscc,
-//             logonTime:moment(info.logonTime).format("YYYY-MM-DD"),
-//             leaseTime:`${moment(info.enterprise_leases[0].startTime).format("YYYY-MM-DD")}至${moment(info.enterprise_leases[0].endTime).format("YYYY-MM-DD")}`,
-//             leaseTimeStart:info.enterprise_leases[0].startTime || 0,
-//             leaseTimeEnd:info.enterprise_leases[0].endTime || 0,
-//             fuHuaTimeStart:info.enterprise_fuhuas[0].startTime||0,
-//             fuHuaTimeEnd:info.enterprise_fuhuas[0].endTime||0,
-//             area:info.enterprise_leases[0].area,
-//             unitPrice:info.enterprise_leases[0].unitPrice,
-//             roomNumber:info.enterprise_leases[0].roomNumber,
-//             rent:info.enterprise_leases[0].rent,
-//             logonAddress:changeAdd(JSON.parse(info.logonAddress)),
-//             userName:info.enterprise_users[0].userName,
-//             pwd:info.enterprise_users[0].pwd,
-//             phone:info.enterprise_users[0].phone,
-//             uId:info.enterprise_users[0].uId,
-//             totalPrice: info.enterprise_leases[0].totalPrice // 添加年总价字段
-//         });
-//     });
-
-//     return {dataList, dataCount:allResList.length};
-// }
-
-// export async function settleInEnterprisePass(eId:string) {
-//     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) throw new BizError(ERRORENUM.该企业已通过审核);
-    
-//     let updateInfo = {
-//         register:enumConfig.STATE.是,
-//         randomCode:randomCode()
-//     }
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
-
-//     return {isSuccess:true};
-// }
-
-// export async function settleInEnterpriseUpdate(eId:string, param) {
-//     const FuncName = "修改入驻信息";
-//     eccFormParam(FuncName, SettleInForUpdateConfig, param );
-
-//     let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone:param.phone}, ["uId"]);
-//     if (userInfo && userInfo.uId &&  userInfo.uId != param.uId) throw new BizError(ERRORENUM.手机号码重复);
-
-//     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) throw new BizError(ERRORENUM.该企业已通过审核);
-
-//     let updateInfo = {
-//         enterpriseName:param.enterpriseName,
-//         uscc:param.uscc,
-//         logonTime:param.logonTime,
-//         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
-//     };
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
-    
-//     let fuHuaInfo = {
-//         startTime:param.fuHuaTimeStart,
-//         endTime:param.fuHuaTimeEndTime,
-//     };
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, fuHuaInfo, {eId});
-
-//     let leaseInfo = {
-//         area:param.area,
-//         // 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,
-//         startTime: param.fuHuaTimeStart, //租赁开始日期
-//         endTime: param.fuHuaTimeEndTime, //租赁结束日期
-//     }
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, leaseInfo, {eId});
-
-
-//     let addUInfo = {
-//         phone:param.phone,
-//         pwd:param.pwd,
-//         userName:param.userName
-//     };
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, addUInfo, {eId, uId:param.uId});
-    
-//     return {isSuccess:true};
-// }
-
-
-// export async function settleInEnterpriseOut(eId:string) {
-//     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) throw new BizError(ERRORENUM.该企业已通过审核);
-
-//     await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业用户表, {}, {eId});//
-//     await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业孵化信息, {}, {eId});
-//     await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.租赁信息, {}, {eId});
-//     await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业基础信息表, {}, {eId});
-
-//     return {isSuccess:true};
-// }
-
-
-// //入孵信息审核
-// export async function enterpriseRegisterExamineList(enterpriseName, page) {
-    
-//     let selectParam:any = {register:enumConfig.STATE.是, state:enumConfig.STATE.否};
-//     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
-
-//     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "randomCode"];
-
-//     let manyTableInfo:any = {}
-//     manyTableInfo[TABLENAME.租赁信息] = {column:["leaseContract", "entryPlan", "businessLicense", "agreement"], where:{} };
-//     manyTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{} };
-//     let resList = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
-//     let allResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["eId"], manyTableInfo );
-
-//     let dataList = [];
-//     resList.forEach(info => {
-//         dataList.push({
-//             eId:info.eId,
-//             enterpriseName:info.enterpriseName,
-//             randomCode:info.randomCode,
-//             leaseContract:info.enterprise_leases[0].leaseContract || "未提交",
-//             entryPlan:info.enterprise_leases[0].entryPlan || "未提交",
-//             businessLicense:info.enterprise_leases[0].businessLicense || "未提交",
-//             agreement:info.enterprise_leases[0].agreement || "未提交"
-//         });
-//     });
-
-//     return {dataList, dataCount:allResList.length};
-// }
-
-// export async function enterpriseRegisterExaminePass(eId:string) {
-//     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) throw new BizError(ERRORENUM.该企业已通过审核);
-
-
-    
-//     let updateInfo = {
-//         state:enumConfig.STATE.是
-//     };
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
-
-//     let updateFuHuaInfo = {
-//         state:enumConfig.FUHUASTATE.实体孵化
-//     };
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, updateFuHuaInfo, {eId});
-
-//     return {isSuccess:true};
-// }
-
-
-// export async function enterpriseRegisterExamineOut(eId:string) {
-//     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) throw new BizError(ERRORENUM.该企业已通过审核);
-
-//     let updateInfo = {
-//         register:2
-//     }
-//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
-
-//     return {isSuccess:true};
-// }
-
-
-
-
-// export async function enterpriseRegister(param) {
-//     const FuncName = "企业注册"
-//     eccFormParam(FuncName, RegisterUpdateConfig, param );
-
-//     let filesList = ["eId", ];
-//     let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
-//     if (enterpriseUserInfo && enterpriseUserInfo.eId) {
-//         throw new BizError(ERRORENUM.企业已存在);
-//     }
-    
-//     let addEInfo = {
-//         eId:randomId(TABLEID.企业基础信息表),
-//         enterpriseName:param.enterpriseName,
-//         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
-//         uscc:param.uscc,
-//         logonTime:getMySqlMs(param.logonTime),
-//         state:0,
-//         register:0,
-//         rent: param.rent
-//     };
-//     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
-
-//     let fuHuaInfo = {
-//         eId:addEInfo.eId,
-//         fId:randomId(TABLEID.企业孵化信息)
-//     };
-//     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业孵化信息, fuHuaInfo, {});
-
-//     let leaseInfo = {
-//         eId:addEInfo.eId,
-//         leaseId:randomId(TABLEID.租赁信息),
-//         startTime:getMySqlMs(param.leaseTimeStart),
-//         endTime:getMySqlMs(param.leaseTimeEnd),
-//         area:param.area
-
-//     }
-//     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
-   
-//     return {isSuccess:true};
-// }
 

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) {