no message

src/biz/ledger.ts

@@ -130,7 +130,7 @@ import { AdminRegisterUpdateConfig } from "../config/eccParam/enterprise";
  * @param page 
  * @returns {dataList, dataCount} 数据列表， 数据总数
  */
-export async function ledgerList(enterpriseName:string, logonStartTime:Number, logonEndTime:Number, building: number, page:number ) {
+export async function ledgerList(enterpriseName:string, phone:string, logonStartTime:Number, logonEndTime:Number, building: number, page:number ) {
     let selectParam: any = {state: enumConfig.CHANGESTATE.已通过};
     if (enterpriseName) { 
         selectParam.enterpriseName = { "%like%": enterpriseName };
@@ -139,11 +139,17 @@ export async function ledgerList(enterpriseName:string, logonStartTime:Number, l
         selectParam.logonTime = {"%between%":[getMySqlMs(logonStartTime), getMySqlMs(logonEndTime)]}
     }
 
+    let userSelectParam:any = {};
+    if (phone) {
+        userSelectParam.phone = { "%like%": phone };;
+    }
+
     // 主表字段过滤参数保持不变
     let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "qiYeGuiMo"];
     let manyTableInfo: any = {};
     let rufuSelectParam = { state: { "%between%": [enumConfig.FUHUASTATE.实体孵化, enumConfig.FUHUASTATE.虚拟孵化] } };
     manyTableInfo[TABLENAME.企业孵化信息] = { column:["moveOutTime", "moveOutType", "startTime", "endTime"], where: rufuSelectParam};
+    manyTableInfo[TABLENAME.企业用户表] = { column:["userName", "phone"], where: userSelectParam};
     let resInfo = await selectManyTableData( OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo );
     
     /**查询租赁表信息 */
@@ -260,6 +266,7 @@ export async function ledgerList(enterpriseName:string, logonStartTime:Number, l
             logonAddress,
             qiYeGuiMo,
             enterprise_fuhuas,
+            enterprise_users,
         } = info;
 
         // 过滤条件：如果没有租赁信息，跳过
@@ -288,10 +295,17 @@ export async function ledgerList(enterpriseName:string, logonStartTime:Number, l
             知识产权总数: 0
         };
 
+        // 获取企业登录信息
+        let phone = "-";
+        if (enterprise_users[0]?.phone) {
+            phone = enterprise_users[0]?.phone;
+        }
+
         zaifuList.push({
             eId,
             enterpriseName, // 企业名称
             uscc, // 统一信用代码
+            phone,//登录手机号
             logonTime: moment(logonTime).format("YYYY-MM-DD"), // 注册日期
             logonAddress: changeAdd(JSON.parse(logonAddress)), // 注册地址
             qiYeGuiMo, // 企业规模

src/biz/mail.ts

@@ -127,8 +127,8 @@ function getModel(name, type, otherStr?, code?) {
     if (!userInfo.mail) {
         new BizError(ERRORENUM.该用户邮箱为空, eId, eId.enterpriseName);
     } else {
-        // let result = await send(userInfo.mail, userInfo.enterpriseName, type, otherStr);
-        let result = "邮件发送成功"
+        let result = await send(userInfo.mail, userInfo.enterpriseName, type, otherStr);
+        // let result = "邮件发送成功"
     }
 
     return successResult();

src/biz/zaiFu.ts

@@ -3,14 +3,14 @@
  */
 
 import moment = require("moment");
-import { OPERATIONALDATATYPE, TABLENAME } from "../config/enum/dbEnum";
+import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
 import { operationalData, paginateArray, selectData, selectManyTableData } from "../data/operationalData";
 import { changeAdd } from "../util/piecemeal";
 import { changeEnumManyValue, changeEnumValue } from "../util/verificationEnum";
 import * as enumConfig from "../config/enum/enum";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/enum/errorEnum";
-import { getMySqlMs, getPwdMd5 } from "../tools/system";
+import { getMySqlMs, getPwdMd5, randomId } from "../tools/system";
 import { BUILDING } from "../config/enum/enum";
 
 
@@ -234,6 +234,77 @@ export async function enterpriseMigrateList(enterpriseName:string, page:number)
 
 
 /**
+ * 移除迁出状态，返回在孵企业
+ * @param eId 企业ID
+ * @returns 
+ */
+export async function enterpriseReturnToIncubation(eId: string) {
+    // 1. 验证企业是否存在且处于迁出状态
+    let filesList = ["eId", "state", "startTime", "endTime"];
+    let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业孵化信息, { eId }, filesList);
+
+    if (!resInfo || !resInfo.eId) {
+        throw new BizError(ERRORENUM.数据不存在);
+    }
+
+    // 检查企业当前状态是否为迁出
+    if (resInfo.state !== enumConfig.FUHUASTATE.迁出) {
+        throw new BizError(ERRORENUM.该企业当前不在迁出状态);
+    }
+
+    // 2. 更新企业孵化信息为在孵状态
+    let updateInfo = {
+        state: enumConfig.FUHUASTATE.实体孵化, // 返回实体孵化状态
+        moveOutTime: null, // 清空迁出时间
+        moveOutType: null, // 清空迁出类型
+        moveOutTrace: null, // 清空迁出去向
+        returnTime: getMySqlMs() // 记录返回时间
+    };
+
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业孵化信息, updateInfo, { eId });
+
+    // 3. 同步创建返回记录到审批表
+    let addApprovalInfo = {
+        approvalId: randomId(TABLEID.入孵申请审批表),
+        eId,
+        changeType: enumConfig.CHANGETYPE.返回在孵, // 需要添加这个枚举值
+        changeState: enumConfig.CHANGESTATE.已通过,
+        createTimeMs: getMySqlMs(),
+        desc: "企业从迁出状态返回在孵"
+    };
+    
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.入孵申请审批表, addApprovalInfo, {});
+
+    // 4. 同步更新在孵企业面积
+    /**在孵企业 当前时间小于孵化结束时间 */
+    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.CHANGESTATE.已通过}, ["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});
+
+    console.log(`企业 ${eId} 已成功从迁出状态返回在孵`);
+    
+    return { 
+        isSuccess: true, 
+        message: "企业已成功返回在孵状态"
+    };
+}
+
+
+/**
  * 重置密码
  * @param eId 
  */

src/config/enum/enum.ts

@@ -288,7 +288,8 @@ export enum CHANGESTATE {
  */
 export enum CHANGETYPE {
     入孵申请 = 1,
-    入孵材料审批 = 2
+    入孵材料审批 = 2,
+    返回在孵 = 3,
 }
 
 

src/config/enum/errorEnum.ts

@@ -44,7 +44,8 @@ export enum ERRORENUM {
     请选择驳回原因,
     原密码错误,
     密码不一致,
-    系统错误
+    系统错误,
+    该企业当前不在迁出状态
 }
 
 export enum ERRORCODEENUM {

src/main.ts

@@ -14,7 +14,7 @@ async function lanuch() {
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
 
-    // await initApiDataStorage();
+    await initApiDataStorage();
     
     // console.log("更新加密后密码格式...");
     // await migrateEnterpriseUserPasswords();

src/routers/admin.ts

@@ -35,6 +35,7 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/settlein/examine/list', checkUser, asyncHandler(examineSettleIn));
     httpServer.post('/admin/enterprise/settlein/examine/pass', checkUser, asyncHandler(examineSettleInPass)); //入孵材料审核 通过
     httpServer.post('/admin/enterprise/settlein/examine/out', checkUser, asyncHandler(examineSettleInOut)); //驳回
+    httpServer.post('/admin/enterprise/settlein/examine/emailreminder', checkUser, asyncHandler(updateEmailReminder));
     
     // //通知
     httpServer.post('/admin/notice/list', checkUser, asyncHandler(noticeList));
@@ -53,6 +54,7 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/library/enterprise/list', checkUser, asyncHandler(enterpriseList));
     httpServer.post('/admin/library/enterprise/migrate/out', checkUser, asyncHandler(enterpriseMigrateOut));//在孵企业迁出功能
     httpServer.post('/admin/library/enterprise/migrate/list', checkUser, asyncHandler(enterpriseMigrateList));//迁出企业列表
+    httpServer.post('/admin/library/enterprise/toincubation', checkUser, asyncHandler(enterpriseReturnToIncubation));//二期新增-移除迁出状态，返回在孵企业
     httpServer.post('/admin/library/enterprise/details', checkUser, asyncHandler(enterpriseDetails));
     httpServer.post('/admin/library/enterprise/resetpwd', checkUser, asyncHandler(resetPwd));
     // httpServer.post('/admin/library/enterprise/details', checkUser, asyncHandler(enterpriseById));
@@ -393,6 +395,21 @@ async function enterpriseMigrateList(req, res) {
     res.success(result);
 }
 
+
+/**
+ * 移除迁出状态，返回在孵企业
+ * @param req 
+ * @param res 
+ */
+async function enterpriseReturnToIncubation(req, res) {
+    const UserInfo = req.userInfo;
+    let {eId} = req.body;
+    let result = await zaiFuBiz.enterpriseReturnToIncubation(eId);
+
+    res.success(result);
+}
+
+
 /**
  * 在孵企业详情
  * @param req 
@@ -820,20 +837,20 @@ async function settleIn(req, res) {
 
 
 /**
- * 
+ * 入孵申请通过
  * @param req 
  * @param res 
  */
 async function settleInPass(req, res) {
     const UserInfo = req.userInfo;
     let { eId } = req.body
-    let result = await ruFuBiz.settleInEnterprisePass(eId);
+    let result = await ruFuBiz.settleInEnterprisePass(eId, "production");
 
     res.success(result);
 }
 
 /**
- * 
+ * 入孵申请回显
  * @param req 
  * @param res 
  */
@@ -847,7 +864,7 @@ async function settleInById(req, res) {
 
 
 /**
- * 
+ * 入孵申请驳回
  * @param req 
  * @param res 
  */
@@ -966,8 +983,20 @@ async function examineSettleInPass(req, res) {
 async function examineSettleInOut(req, res) {
     const UserInfo = req.userInfo;
     let { eId, descType, desc  } = req.body;
-    let result = await ruFuBiz.enterpriseRegisterExamineOut(eId, descType, desc );
+    let result = await ruFuBiz.enterpriseRegisterExamineOut(eId, descType, desc, "production" );
+
+    res.success(result);
+}
 
+
+/**
+ * 修改是否邮件通知状态
+ * @param req 
+ * @param res 
+ */
+async function updateEmailReminder(req, res) {
+    let { eId, emailReminder } = req.body;
+    let result = await ruFuBiz.updateEmailReminder(eId, emailReminder);
     res.success(result);
 }
 

src/routers/ledger.ts

@@ -23,8 +23,8 @@ export function setRouter(httpServer) {
  */
 async function ledgerList(req, res) {
     const UserInfo = req.userInfo;
-    let {enterpriseName, logonStartTime, logonEndTime, building, page } = req.body
-    let result = await ledgerBiz.ledgerList(enterpriseName, logonStartTime, logonEndTime, building, page);
+    let {enterpriseName, phone, logonStartTime, logonEndTime, building, page } = req.body
+    let result = await ledgerBiz.ledgerList(enterpriseName, phone, logonStartTime, logonEndTime, building, page);
 
     res.success(result);
 }

src/routers/userRuFu.ts

@@ -13,7 +13,6 @@ export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/rufu/settleininfo', asyncHandler(settleInById));
     httpServer.post('/admin/enterprise/rufu/info', asyncHandler(getRuFu));
     httpServer.post('/admin/enterprise/rufu/update', asyncHandler(updateRuFu));
-
 }
 
 
@@ -23,7 +22,7 @@ export function setRouter(httpServer) {
  * @param res 
  */
  async function register(req, res) {
-    let {userName, phone, pwd } = req.body
+    let { userName, phone, pwd } = req.body
     let result = await userRuFuBiz.enterpriseRegister(userName, phone, pwd);
     res.success(result);
 }
@@ -35,20 +34,19 @@ export function setRouter(httpServer) {
  * @param res 
  */
  async function login(req, res) {
-    let {phone, pwd } = req.body
+    let { phone, pwd } = req.body
     let result = await userRuFuBiz.enterpriseLogin(phone, pwd);
     res.success(result);
 }
 
 
-
 /**
  * 获取入孵流程状态
  * @param req 
  * @param res 
  */
  async function ruFuState(req, res) {
-    let {uId } = req.body
+    let { uId } = req.body
     let result = await userRuFuBiz.getRuFuState(uId);
     res.success(result);
 }
@@ -66,8 +64,9 @@ export function setRouter(httpServer) {
     res.success(result);
 }
 
+
 /**
- * 
+ * 入孵申请回显
  * @param req 
  * @param res 
  */