no message

src/biz/ruFu.ts

@@ -40,7 +40,7 @@ import { changeEnumValue } from "../util/verificationEnum";
         uscc:param.uscc,
         logonTime:getMySqlMs(param.logonTime),
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
-        mail:param.mail,//邮箱
+        mail:param.mail,//邮箱地址
         state:0,
         register:0
     };
@@ -104,7 +104,7 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
     let selectParam:any = {register:enumConfig.STATE.否, state:enumConfig.STATE.否};
     if (enterpriseName) selectParam.enterpriseName = {"%like%":enterpriseName};
 
-    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress"];
+    let filesList = ["eId", "enterpriseName", "uscc", "logonTime", "logonAddress", "mail"];
 
     let manyTableInfo:any = {}
     manyTableInfo[TABLENAME.租赁信息] = {column:["area", "unitPrice", "roomNumber", "rent", "totalPrice"], where:{} };
@@ -118,9 +118,9 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
     resList.forEach(info => {
         dataList.push({
             eId:info.eId,
-            enterpriseName:info.enterpriseName,
-            uscc:info.uscc,
-            logonTime:moment(info.logonTime).format("YYYY-MM-DD"),
+            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,
@@ -128,18 +128,19 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
             leaseEnd: moment(info.enterprise_leases[0].endTime).format("YYYY-MM-DD"),
             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,
+            area:info.enterprise_leases[0].area,//租赁面积
+            unitPrice:info.enterprise_leases[0].unitPrice,//——暂时没用
             // roomNumber:info.enterprise_leases[0].roomNumber,
             building: info.enterprise_leases[0].building || "",// 园区楼号
             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,
+            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,//登录手机号
+            mail:info.mail,//邮箱地址
             uId:info.enterprise_users[0].uId,
-            totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段
+            totalPrice: info.enterprise_leases[0].totalPrice, // 添加年总价字段——暂时没用
             status: info.approval_historys.changeState === enumConfig.CHANGESTATE.已驳回 ? "已驳回" : "未审核" // 状态映射 todo
         });
     });
@@ -233,7 +234,7 @@ export async function settleInEnterpriseUpdate(eId:string, 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 filesList = ["eId", "enterpriseName", "uscc", "logonTime", "state", "mail"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
     if (!resInfo || !resInfo.eId) {
         throw new BizError(ERRORENUM.数据不存在);
@@ -245,6 +246,7 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
         uscc:param.uscc,
         logonTime:param.logonTime,
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
+        // mail:param.mail,
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业基础信息表, updateInfo, {eId});
     
@@ -264,6 +266,8 @@ export async function settleInEnterpriseUpdate(eId:string, param) {
         rent:param.rent,
         startTime: param.fuHuaTimeStart, //租赁开始日期
         endTime: param.fuHuaTimeEndTime, //租赁结束日期
+        // building:param.building,
+        // roomNumber:param.roomNumber,
     }
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, leaseInfo, {eId});
 

src/config/eccParam/enterprise.ts

@@ -40,14 +40,18 @@ export const SettleInForUpdateConfig = {
     logonAddress:{type:"String"},//注册地址
     fuHuaTimeStart:{type:"Number"},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
+    // leaseTimeStart:{type:"Number"},//租赁开始时间
+    // leaseTimeEndTime:{type:"Number"},//租赁结束时间
     area:{type:"Number"},//面积
     // unitPrice:{type:"Number"},//单价
+    building:{type:"String"},//楼号
     roomNumber:{type:"String"},//室号
     rent:{type:"Number"},//每月租金
     // totalPrice:{type:"Number"},//总价
     pwd:{type:"String"},
     phone:{type:"String"},
     userName:{type:"String"},
+    // mail:{type:"String"},//邮箱
     uId:{type:"String"}
 }
 
@@ -79,7 +83,7 @@ export const AdminRegisterAddConfig = {
     userName:{type:"String",required: true, message: '用户名不能为空'},
     leaseStartTime: { type: 'string', required: true, message: '租赁开始时间不能为空' },
     leaseEndTime: { type: 'string', required: true, message: '租赁结束时间不能为空' },
-    email: { type: 'string', required: true, message: '邮箱地址不能为空' },
+    mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
 }
 
 
@@ -107,6 +111,16 @@ export const YuYiBaseDataUpdateConfig = {
     zaifuArea:{type:"String"},//在孵面积
     rentRate:{type:"String"},//出租率
     uscc:{type:"String"},//统一信用代码
+    building:{type:"String"},//楼号
+    occupancyRate:{type:"String"},//入驻率
+    enteredEnterprises:{type:"String"},//入驻企业
+    onlinePromotion:{type:"String"},//线上推广
+    offlinePromotion:{type:"String"},//线下推广
+    tiktok:{type:"String"},//抖音
+    theLittleRedBook:{type:"String"},//小红书
+    videoNumber:{type:"String"},//视频号
+    eventPromotion:{type:"String"},//活动宣讲
+    tripartiteInstitutionalCooperation:{type:"String"},//三方机构合作
     // ziyonArea:{type:"String"},//自用面积
     // parkArea:{type:"String"},//新增
     // industrialScale:{type:"String"},
@@ -128,7 +142,7 @@ export const UserRegisterAddConfig = {
     rent:{type:"Number", required: true, message: '每月租金不能为空'},//每月租金
     leaseStartTime: { type: 'string', required: true, message: '租赁开始时间不能为空' },
     leaseEndTime: { type: 'string', required: true, message: '租赁结束时间不能为空' },
-    email: { type: 'string', required: true, message: '邮箱地址不能为空' },
+    mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
     userName: { type: 'string', required: true, message: '联系人不能为空' },
     phone: { type: 'string', required: true, message: '登录手机号码不能为空' },
     pwd: { type: 'string', required: true, message: '登录密码不能为空' },

src/config/enum/dbEnum.ts

@@ -39,6 +39,8 @@ export enum TABLENAME {
     政策表 = 'policy',
     管理后台用户 = 'adminUser',
     入孵申请审批表 ='approval_history',
+    入驻信息表 = "info_enter",
+    运营推广信息表 = "info_operation_promotion",
     
 }
 
@@ -62,5 +64,8 @@ export enum TABLEID {
     企业基础信息表 ='e',
     图片存储='img',
     政策表 = 'zc',
-    入孵申请审批表 = 'ah'
+    入孵申请审批表 = 'ah',
+    入驻信息表 = "ei",
+    运营推广信息表 = "opi",
+ 
 } 
\ No newline at end of file