Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiAdminServer

src/biz/fuhua.ts

@@ -295,6 +295,7 @@ export async function getBaseData() {
 
 //     return {operateData};
 // }
+
 export async function getOperateData(year) {
     let yearTime = moment(year, "YYYY").startOf('year').format("YYYY-MM-DD");
     console.log("yearTime:", yearTime);
@@ -800,9 +801,9 @@ export async function updateYuYi(yId, param) {
     
     let  entryInfo = param.entryInfo;
     for (let key in entryInfo) {
-        let updateInfo = {occupancyRate:entryInfo[key].入驻率, enteredEnterprises:entryInfo[key].入驻企业};
+        let 入驻信息updateInfo = {occupancyRate:entryInfo[key].入驻率, enteredEnterprises:entryInfo[key].入驻企业};
         let updateParam = {building:key}
-        await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.入驻信息表, updateInfo, updateParam);
+        await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.入驻信息表, 入驻信息updateInfo, updateParam);
     }
     let promotionInfo = param.promotionInfo
     for (let key in promotionInfo) {
@@ -815,21 +816,21 @@ export async function updateYuYi(yId, param) {
                 updateParam.promotionApp = OFFLINEPROMOTION[app];
             }
             let 运营推广dbInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.运营推广信息表, updateParam, ["opId", "promotionType", "promotionApp", "promotionNum"]); 
-            if (!运营推广dbInfo || !运营推广dbInfo.opId) {
+            if (!Object.keys(运营推广dbInfo).length) {
+                if (updateInfo.promotionNum) {
                     let addInfo = {
                         opId:randomId(TABLENAME.运营推广信息表),
                         promotionType:updateParam.promotionType,
                         promotionApp:updateParam.promotionApp,
-                    promotionNum:updateInfo.promotionNum
+                        promotionNum:updateInfo.promotionNum || ""
                     };
                     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.运营推广信息表, addInfo, {});
+                }
             } else {
-                await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.运营推广信息表, updateInfo, updateParam);
+                await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.运营推广信息表, {promotionNum:promotionInfo[key][app]}, updateParam);
             }
         }
     }
-    // await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.入驻信息表, param, {info_enterId:yuyiInfo.info_enterId});
-    // await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.运营推广信息表, param, {opId:yuyiInfo.opId});
 
     return {isSuccess:true};
 }

src/biz/ruFu.ts

@@ -548,7 +548,7 @@ export async function updateRuFu(eId:string, param) {
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
     }
-    if (resInfo.state == 1) {
+    if (resInfo.state == enumConfig.CHANGESTATE.已通过) {
         throw new BizError(ERRORENUM.已审核请前往小程序登录)
     } 
 
@@ -579,7 +579,7 @@ export async function enterpriseRegister(param) {
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
         uscc:param.uscc,
         logonTime:getMySqlMs(param.logonTime),
-        state:0,
+        state:enumConfig.CHANGESTATE.未审核,
         register:enumConfig.CHANGESTATE.未审核,
         rent: param.rent,
         // randomCode: randomCode() // 在企业注册时生成 randomCode

src/biz/userRuFu.ts

@@ -10,7 +10,7 @@ import { operationalData, selectData, selectManyTableData } from "../data/operat
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/enum/errorEnum";
 import { getMySqlMs, getToken, randomId } from "../tools/system";
-import { extractData } from "../util/piecemeal";
+import { changeAdd, extractData } from "../util/piecemeal";
 import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
 import { CHANGESTATE, CHANGETYPE, FUHUASTATE, RUFUSTATE, STATE } from "../config/enum/enum";
 
@@ -77,9 +77,10 @@ export async function enterpriseLogin(phone:string, pwd:string) {
  * @returns 
  */
 export async function getRuFuState(uId) {
+    let ruFuState = 0;
+    if (!uId) return {ruFuState};
     let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {uId}, ["uId", "phone", "pwd", "eId"]);
 
-    let ruFuState = 0;
     //没有eId数据代表未填写过入孵申请
     if (!enterpriseUserInfo.eId) {
         ruFuState = RUFUSTATE.入孵申请信息填写;
@@ -198,6 +199,53 @@ export async function createRuFu(uId, param) {
 
 
 /**
+ * 入孵申请回显
+ * @param eId 
+ * @returns 
+ */
+export async function settleInEnterpriseById(eId:string) {
+    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, []);
+    if (!enterpriseUserInfo || !enterpriseUserInfo.eId) {
+        throw new BizError(ERRORENUM.请先申请入孵);
+    }
+   
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "mail"];
+    let manyTableInfo:any = {}
+    manyTableInfo[TABLENAME.租赁信息] = {column:["area", "building", "roomNumber", "rent", "startTime", "endTime"], where:{} };
+    manyTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{} };
+    manyTableInfo[TABLENAME.企业用户表] = {column:["userName", "pwd", "phone", "uId"], where:{} };
+    let resList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, {eId}, filesList, manyTableInfo );
+    
+    let dataInfo = {};
+    resList.forEach(info => {
+        dataInfo = {
+            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")}`,
+            fuHuaTimeStart:info.enterprise_fuhuas[0].startTime||0, //孵化开始时间
+            fuHuaTimeEnd:info.enterprise_fuhuas[0].endTime||0, //孵化结束时间
+            leaseStartTime:info.enterprise_leases[0].startTime || 0, //租赁开始时间
+            leaseEndTime:info.enterprise_leases[0].endTime || 0, //租赁结束时间
+            rent:info.enterprise_leases[0].rent,//月租金
+            area:info.enterprise_leases[0].area,//租赁面积
+            building: info.enterprise_leases[0].building || "",// 园区楼号
+            roomNumber: info.enterprise_leases[0].roomNumber || "",// 室号
+            logonAddress:changeAdd(JSON.parse(info.logonAddress)),//注册地址
+            userName:info.enterprise_users[0].userName,//联系人
+            pwd:info.enterprise_users[0].pwd,//登录密码
+            phone:info.enterprise_users[0].phone,//登录手机号
+            mail:info.mail,//邮箱地址
+            uId:info.enterprise_users[0].uId,
+        };
+    });
+
+    return {dataInfo};
+}
+
+
+/**
  * 入孵材料回显
  * @param eId 
  * @returns 
@@ -257,10 +305,11 @@ export async function updateRuFu(eId:string, param) {
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
     }
-    if (resInfo.state == 1) {
+    if (resInfo.state == CHANGESTATE.已通过) {
         throw new BizError(ERRORENUM.已审核请前往小程序登录)
     }
     
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, {state:CHANGESTATE.未审核}, {});
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, param, {eId});
 
     return {isSuccess:true};

src/config/enum/enum.ts

@@ -223,7 +223,7 @@ export enum STATE {
  */
 export enum CHANGESTATE {
     未审核 = 0,//未审核
-    已驳回 = 1,//已通过
+    已驳回 = 1,//已驳回
     // 重新提交 = 2,
     已通过
 }

src/routers/userRuFu.ts

@@ -10,6 +10,7 @@ export function setRouter(httpServer) {
     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/settleininfo', asyncHandler(settleInById));
     httpServer.post('/admin/enterprise/rufu/info', asyncHandler(getRuFu));
     httpServer.post('/admin/enterprise/rufu/update', asyncHandler(updateRuFu));
 
@@ -65,6 +66,19 @@ export function setRouter(httpServer) {
     res.success(result);
 }
 
+/**
+ * 
+ * @param req 
+ * @param res 
+ */
+async function settleInById(req, res) {
+    const UserInfo = req.userInfo;
+    let { eId } = req.body
+    let result = await userRuFuBiz.settleInEnterpriseById(eId);
+
+    res.success(result);
+}
+
 
 /**
  * 企业入孵材料回显