no message

src/biz/ruFu.ts

@@ -150,7 +150,6 @@ export async function settleInEnterpriseOut(eId:string) {
 
 //入孵信息审核
 export async function enterpriseRegisterExamineList(enterpriseName, page) {
-    
     let selectParam:any = {register:enumConfig.STATE.是, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
@@ -179,15 +178,20 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
 }
 
 export async function enterpriseRegisterExaminePass(eId:string) {
+    let manyTableInfo:any = {}
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
-    let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
+    manyTableInfo[TABLENAME.租赁信息] = {column:["leaseContract", "entryPlan", "businessLicense", "agreement"], where:{} };
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表单个, TABLENAME.企业基础信息表, {eId}, filesList, manyTableInfo);
+    // let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
 
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
     }
+    
+    if (!resInfo.enterprise_leases[0].leaseContract || !resInfo.enterprise_leases[0].entryPlan || !resInfo.enterprise_leases[0].businessLicense || !resInfo.enterprise_leases[0].agreement) {
+        throw new BizError(ERRORENUM.请上传所有入孵材料);
+    }
     if (resInfo.state) throw new BizError(ERRORENUM.该企业已通过审核);
-
-
     
     let updateInfo = {
         state:enumConfig.STATE.是
@@ -199,10 +203,33 @@ export async function enterpriseRegisterExaminePass(eId:string) {
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, updateFuHuaInfo, {eId});
 
+    /**同步修改入孵企业面积 */
+    
+    /**在孵企业 当前时间小于孵化结束时间 */
+    let 在孵面积 = 0;
+    let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
+    let zaifuTableInfo:any = {};
+    zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
+    zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} };
+    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state:enumConfig.STATE.是}, ["eId"], zaifuTableInfo );
+    
+    zaifuResList.forEach( info => {
+        info.enterprise_leases.forEach( lease => {
+            在孵面积 += parseFloat(lease.area);
+        })
+    })
+    let yuyiList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.羽翼孵化器信息, {}, []);
+    if (在孵面积 != yuyiList.zaifuArea) await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.羽翼孵化器信息, {zaifuArea:在孵面积}, {yId:yuyiList.yId});
+
     return {isSuccess:true};
 }
 
 
+/**
+ * 材料上传驳回
+ * @param eId 
+ * @returns 
+ */
 export async function enterpriseRegisterExamineOut(eId:string) {
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
@@ -212,11 +239,20 @@ export async function enterpriseRegisterExamineOut(eId:string) {
     }
     if (resInfo.state) throw new BizError(ERRORENUM.该企业已通过审核);
 
+    let updateLeaseInfo = {
+        leaseContract:null, 
+        entryPlan:null,
+        businessLicense:null,
+        agreement:null
+    }
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, updateLeaseInfo, {eId});
+
     let updateInfo = {
-        register:2
+        register:enumConfig.STATE.是
+        // register:2
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
-
+    
     return {isSuccess:true};
 }
 

src/biz/userRuFu.ts

@@ -4,7 +4,7 @@
 
 import moment = require("moment");
 import { eccFormParam } from "../util/verificationParam";
-import { AdminRegisterAddConfig, AdminRegisterUpdateConfig } from "../config/eccParam/enterprise";
+import { AdminRegisterAddConfig, AdminRegisterUpdateConfig, UserRegisterAddConfig } from "../config/eccParam/enterprise";
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { BizError } from "../util/bizError";
@@ -59,16 +59,6 @@ export async function enterpriseLogin(phone:string, pwd:string) {
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, updateUserInfo, {uId:enterpriseUserInfo.uId});
 
-    let ruFuState = 0;
-    if (!enterpriseUserInfo.eId) {
-        ruFuState = RUFUSTATE.信息填写;
-    } else {
-        let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId:enterpriseUserInfo.eId}, ["enterpriseName", "eId"]);
-        if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.否) ruFuState = RUFUSTATE.信息审核中;
-        else if (enterpriseInfo.state == STATE.是 && enterpriseInfo.register == STATE.否) ruFuState = RUFUSTATE.补充材料;
-        else if (enterpriseInfo.state == STATE.是 && enterpriseInfo.register == STATE.是) ruFuState = RUFUSTATE.材料审核完成;
-    }
-    
     let userInfo = {
         userId:enterpriseUserInfo.uId,
         userName:enterpriseUserInfo.userName,
@@ -77,7 +67,34 @@ export async function enterpriseLogin(phone:string, pwd:string) {
         eId:enterpriseUserInfo.eId || ""
     };
 
-    return {dataInfo:userInfo, ruFuState};
+    return {dataInfo:userInfo};
+}
+
+
+/**
+ * 获取入孵流程状态
+ * @param uId 
+ * @returns 
+ */
+export async function getRuFuState(uId) {
+    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {uId}, ["uId", "phone", "pwd", "eId"]);
+
+    let ruFuState = 0;
+    if (!enterpriseUserInfo.eId) {
+        ruFuState = RUFUSTATE.信息填写;
+    } else {
+        let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId:enterpriseUserInfo.eId}, ["enterpriseName", "eId", "state", "register"]);
+        if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.否) ruFuState = RUFUSTATE.信息审核中;
+        if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.是) {
+            let leaseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.租赁信息, {eId:enterpriseUserInfo.eId}, []);
+            if (!leaseInfo.leaseContract && !leaseInfo.entryPlan || !leaseInfo.businessLicense || !leaseInfo.agreement) ruFuState = RUFUSTATE.补充材料;
+            else ruFuState = RUFUSTATE.材料已提交;
+        }
+        // if (enterpriseInfo.register == 2) ruFuState = RUFUSTATE.材料审核驳回;
+        if (enterpriseInfo.state == STATE.是 && enterpriseInfo.register == STATE.是) ruFuState = RUFUSTATE.材料审核完成;
+    }
+    
+    return {ruFuState};
 }
 
 
@@ -86,7 +103,7 @@ export async function enterpriseLogin(phone:string, pwd:string) {
  */
 export async function createRuFu(uId, param) {
     const FuncName = "网页添加信息填写"
-    eccFormParam(FuncName, AdminRegisterAddConfig, param );
+    eccFormParam(FuncName, UserRegisterAddConfig, param );
 
     let filesList = ["eId", "uscc"];
     let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
@@ -129,7 +146,7 @@ export async function createRuFu(uId, param) {
     }
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
 
-    return {isSuccess:true};
+    return {eId:addEInfo.eId};
 }
 
 
@@ -190,7 +207,7 @@ export async function updateRuFu(eId:string, param) {
     }
     if (resInfo.state == 1) {
         throw new BizError(ERRORENUM.已审核请前往小程序登录)
-    } 
+    }
 
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, param, {eId});
 

src/biz/zaiFu.ts

@@ -74,6 +74,24 @@ export async function enterpriseMoveOut(eId: string, moveOutType: number) {
 
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, addInfo, { eId });
 
+    /**同步修改入孵企业面积 */
+    
+    /**在孵企业 当前时间小于孵化结束时间 */
+    let 在孵面积 = 0;
+    let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
+    let zaifuTableInfo:any = {};
+    zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
+    zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} };
+    let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {state:enumConfig.STATE.是}, ["eId"], zaifuTableInfo );
+    
+    zaifuResList.forEach( info => {
+        info.enterprise_leases.forEach( lease => {
+            在孵面积 += parseFloat(lease.area);
+        })
+    })
+    let yuyiList = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.羽翼孵化器信息, {}, []);
+    if (在孵面积 != yuyiList.zaifuArea) await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.羽翼孵化器信息, {zaifuArea:在孵面积}, {yId:yuyiList.yId});
+
     return { isSuccess: true };
 }
 

src/config/eccParam/enterprise.ts

@@ -79,9 +79,9 @@ export const AdminRegisterAddConfig = {
     roomNumber:{type:"String"},//室号
     rent:{type:"Number"},//每月租金
     // totalPrice:{type:"Number"},//总价
-    // pwd:{type:"String"},
-    // phone:{type:"String"},
-    // userName:{type:"String"}
+    pwd:{type:"String"},
+    phone:{type:"String"},
+    userName:{type:"String"}
 }
 
 
@@ -118,3 +118,15 @@ export const YuYiBaseDataUpdateConfig = {
 
 
 
+export const UserRegisterAddConfig = {
+    enterpriseName:{type:"String"},
+    uscc:{type:"String"},//信用代码
+    logonTime:{type:"Number"},//注册时间
+    logonAddress:{type:"String"},//注册地址
+    fuHuaTimeStart:{type:"Number"},//孵化开始时间
+    fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
+    area:{type:"Number"},//面积
+    roomNumber:{type:"String"},//室号
+    rent:{type:"Number"},//每月租金
+}
+

src/config/enum/enum.ts

@@ -225,7 +225,9 @@ export enum RUFUSTATE {
     信息审核成功 = 3,
     信息审核失败 = 4,
     补充材料 = 5,
-    材料审核完成 = 6
+    材料已提交 = 6,
+    // 材料审核驳回 = 7,
+    材料审核完成 = 7
 }
 
 

src/config/enum/errorEnum.ts

@@ -35,7 +35,8 @@ export enum ERRORENUM {
     数据库错误,
     该企业已迁出,
     账号不存在,
-    密码只能由6至18位字符和数字组成
+    密码只能由6至18位字符和数字组成,
+    请上传所有入孵材料
 }
 
 export enum ERRORCODEENUM {

src/routers/userRuFu.ts

@@ -8,6 +8,7 @@ import * as userRuFuBiz from '../biz/userRuFu';
 export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/rufu/register', asyncHandler(register));
     httpServer.post('/admin/enterprise/rufu/login', asyncHandler(login));
+    httpServer.post('/admin/enterprise/rufu/rufustate', asyncHandler(ruFuState));
     httpServer.post('/admin/enterprise/rufu/add', asyncHandler(addRuFu));
     httpServer.post('/admin/enterprise/rufu/info', asyncHandler(getRuFu));
     httpServer.post('/admin/enterprise/rufu/update', asyncHandler(updateRuFu));
@@ -15,8 +16,6 @@ export function setRouter(httpServer) {
 }
 
 
-
-
 /**
  * 注册
  * @param req 
@@ -41,6 +40,19 @@ export function setRouter(httpServer) {
 }
 
 
+
+/**
+ * 登录
+ * @param req 
+ * @param res 
+ */
+ async function ruFuState(req, res) {
+    let {uId } = req.body
+    let result = await userRuFuBiz.getRuFuState(uId);
+    res.success(result);
+}
+
+
 /**
  * 添加入孵企业
  * @param req