no message

src/biz/admin.ts

 /**
  * 企业信息
  * 汇总
- * 
- *
  * */
  
-
 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";
@@ -687,7 +684,12 @@ export async function getiprDetails(eId: string) {
 }
            
 
-
+/**
+ * 资质认证列表
+ * @param enterpriseName 
+ * @param page 
+ * @returns 
+ */
 export async function qiyeRenZheng(enterpriseName, page) {
     let selectParam:any = {};
     if (enterpriseName) {
@@ -735,32 +737,32 @@ export async function qiyeRenZheng(enterpriseName, page) {
         let updateInfo:any = {};
         for (let i = 0; i < enterprise_qualifications.length; i++) {
             let item = enterprise_qualifications[i];
-            /**状态与时间逻辑不对的话，修改状态 */
-            if (item.kxTime && item.kxState != enumConfig.STATE.否) {
+            /**状态与时间逻辑不对的话，修改状态 时间有数据，但状态为否，自动修改状态为是 */
+            if (item.kxTime && item.kxState != enumConfig.STATE.是) {
                 updateInfo.kxState = enumConfig.STATE.是;
                 item.kxState = enumConfig.STATE.是;
             }
-            if (item.zjtxTime && item.zjtxState != enumConfig.STATE.否) {
+            if (item.zjtxTime && item.zjtxState != enumConfig.STATE.是) {
                 updateInfo.zjtxState = enumConfig.STATE.是;
                 item.zjtxState = enumConfig.STATE.是;
             }
-            if (item.xjrTime && item.xjrState != enumConfig.STATE.否) {
+            if (item.xjrTime && item.xjrState != enumConfig.STATE.是) {
                 updateInfo.xjrState = enumConfig.STATE.是; 
                 item.xjrState = enumConfig.STATE.是; 
             }
-            if (item.xjrPyTime && item.xjrPyState != enumConfig.STATE.否) {
+            if (item.xjrPyTime && item.xjrPyState != enumConfig.STATE.是) {
                 updateInfo.xjrPyState = enumConfig.STATE.是; 
                 item.xjrPyState = enumConfig.STATE.是; 
             }
-            if (item.goPublicTime && item.listedState != enumConfig.STATE.否) {
+            if (item.goPublicTime && item.listedState != enumConfig.STATE.是) {
                 updateInfo.listedState = enumConfig.STATE.是; 
                 item.listedState = enumConfig.STATE.是; 
             }
-            if (item.gaoXinJiShuTime && item.gxjsState != enumConfig.STATE.否) {
+            if (item.gaoXinJiShuTime && item.gxjsState != enumConfig.STATE.是) {
                 updateInfo.gxjsState = enumConfig.STATE.是; 
                 item.gxjsState = enumConfig.STATE.是; 
             }
-            if(Object.keys(updateInfo).length > 0) await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, updateInfo, {qId:item.qId});
+            if(Object.keys(updateInfo).length > 0) await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业资质, updateInfo, {qId:item.qId});
 
             if (item.kxTime) addItem.kxTime = moment(item.kxTime).format("YYYY");
             if (item.kxState) addItem.kxState = changeEnumValue(enumConfig.STATE, item.kxState);

src/biz/fuhua.ts

@@ -349,7 +349,6 @@ export async function getWorthDate() {
     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);

src/biz/userRuFu.ts

+/**
+ * 网页端企业自己申请入孵
+ */
+
+import moment = require("moment");
+import { eccFormParam } from "../util/verificationParam";
+import { AdminRegisterAddConfig, AdminRegisterUpdateConfig } from "../config/eccParam/enterprise";
+import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
+import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
+import { BizError } from "../util/bizError";
+import { ERRORENUM } from "../config/enum/errorEnum";
+import { getMySqlMs, getToken, randomId } from "../tools/system";
+import { extractData } from "../util/piecemeal";
+import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
+import { FUHUASTATE, RUFUSTATE, STATE } from "../config/enum/enum";
+
+
+/**
+ * 注册
+ * @param phone 
+ * @param pwd 
+ * @returns 
+ */
+ export async function enterpriseRegister(userName:string, phone:string, pwd:string) {
+    /**校验密码 */
+    if (pwd.search(/^[A-Za-z0-9]{6,18}$/) < 0) throw new BizError(ERRORENUM.密码只能由6至18位字符和数字组成);
+
+    /**校验去重 */
+    let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone}, ["uId"]);
+    if (userInfo && userInfo.uId) throw new BizError(ERRORENUM.手机号码重复);
+
+    let addUInfo = {
+        uId:randomId(TABLEID.企业用户表),
+        userName,
+        phone,
+        pwd
+    };
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业用户表, addUInfo, {});
+    
+    return {isSuccess:true};
+}
+
+
+/**
+ * 登录
+ * @param phone 
+ * @param pwd 
+ * @returns 
+ */
+export async function enterpriseLogin(phone:string, pwd:string) {
+    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone}, ["uId", "phone", "pwd", "eId"]);
+
+    if (!enterpriseUserInfo || !enterpriseUserInfo.uId) throw new BizError(ERRORENUM.账号不存在);
+    if (enterpriseUserInfo.pwd != pwd) throw new BizError(ERRORENUM.账号或密码错误);
+
+    let updateUserInfo = {
+        token : getToken(enterpriseUserInfo.uId),
+        tokenMs : getMySqlMs()
+    };
+    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,
+        phone:enterpriseUserInfo.phone,
+        token:updateUserInfo.token,
+        eId:enterpriseUserInfo.eId || ""
+    };
+
+    return {dataInfo:userInfo, ruFuState};
+}
+
+
+/**
+ * 添加信息填写
+ */
+export async function createRuFu(uId, param) {
+    const FuncName = "网页添加信息填写"
+    eccFormParam(FuncName, AdminRegisterAddConfig, param );
+
+    let filesList = ["eId", "uscc"];
+    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,
+        uscc:param.uscc,
+        logonTime:getMySqlMs(param.logonTime),
+        logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
+        state:0,
+        register:0
+    };
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
+
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, {eId:addEInfo.eId}, {uId});
+
+    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,
+        roomNumber:param.roomNumber,
+        startTime:getMySqlMs(param.fuHuaTimeStart), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化开始时间
+        endTime:getMySqlMs(param.fuHuaTimeEndTime), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化结束时间
+        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};
+}
+
+
+
+
+
+

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"}
 }
 
 

src/config/enum/enum.ts

@@ -219,6 +219,13 @@ export enum IPRTYPECLIENTZL {
 }
 
 
-
+export enum RUFUSTATE {
+    信息填写 = 1,
+    信息审核中 = 2,
+    信息审核成功 = 3,
+    信息审核失败 = 4,
+    补充材料 = 5,
+    材料审核完成 = 6
+}
 
 

src/config/enum/errorEnum.ts

@@ -33,7 +33,9 @@ export enum ERRORENUM {
     用户已存在,
     手机号码重复,
     数据库错误,
-    该企业已迁出
+    该企业已迁出,
+    账号不存在,
+    密码只能由6至18位字符和数字组成
 }
 
 export enum ERRORCODEENUM {

src/routers/router.ts

@@ -6,6 +6,7 @@ import * as publicRouters from './public';
 import * as enterpriseInfoRouters from './admin';
 import * as fuhuaRouters from './fuhua';
 import * as dbInitRouters from './dbinit';
+import * as userRuFuRouters from './userRuFu';
 export function setRouter(httpServer){
     /**下拉框等公用 路由 */
     publicRouters.setRouter(httpServer);
@@ -15,4 +16,6 @@ export function setRouter(httpServer){
     fuhuaRouters.setRouter(httpServer);
 
     dbInitRouters.setRouter(httpServer);
+
+    userRuFuRouters.setRouter(httpServer);
 }
\ No newline at end of file

src/routers/userRuFu.ts

+/**
+ * 企业网页填报入孵申请
+ */
+
+import * as asyncHandler from 'express-async-handler';
+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/add', asyncHandler(addRuFu));
+    httpServer.post('/admin/enterprise/rufu/info', asyncHandler(getRuFu));
+    httpServer.post('/admin/enterprise/rufu/update', asyncHandler(updateRuFu));
+
+}
+
+
+
+
+/**
+ * 注册
+ * @param req 
+ * @param res 
+ */
+ async function register(req, res) {
+    let {userName, phone, pwd } = req.body
+    let result = await userRuFuBiz.enterpriseRegister(userName, phone, pwd);
+    res.success(result);
+}
+
+
+/**
+ * 登录
+ * @param req 
+ * @param res 
+ */
+ async function login(req, res) {
+    let {phone, pwd } = req.body
+    let result = await userRuFuBiz.enterpriseLogin(phone, pwd);
+    res.success(result);
+}
+
+
+/**
+ * 添加入孵企业
+ * @param req 
+ * @param res 
+ */
+ async function addRuFu(req, res) {
+    let { uId, param } = req.body;
+    let result = await userRuFuBiz.createRuFu(uId, param);
+
+    res.success(result);
+}
+
+
+/**
+ * 企业入孵材料回显
+ * @param req 
+ * @param res 
+ */
+ async function getRuFu(req, res) {
+    let { eId } = req.body
+    let result = await userRuFuBiz.getRuFu(eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 管理员编辑企业材料
+ * @param req 
+ * @param res 
+ */
+ async function updateRuFu(req, res) {
+    let { eId, param } = req.body
+    let result = await userRuFuBiz.updateRuFu(eId, param);
+
+    res.success(result);
+}
+
+
+
+
+