no message

src/biz/mobileFuHuaQi/enterprise/financing.ts

@@ -165,6 +165,7 @@ export async function getFuHuaQiEnterpriseForSelect(uscc:string) {
         if (info.state != configEnum.FUHUASTATE.迁出) {
             dataList.push({
                 name:info.name,
+                uscc:info.uscc,
                 logonAddress:info.logonAddress, 
                 operatingAddress:info.operatingAddress
             });

src/biz/mobileFuHuaQi/fuHuaQi/task/monthTask.ts

@@ -71,7 +71,8 @@ export async function fuHuaQiTaskList(uscc:string) {
             /**没有提交任务 则获取本月提交的任务相关信息 */
             if (taskMap[ValueStr] && !taskMap[ValueStr].isSubmit) {
                 let dataList = [];
-                onceObj.month = taskMap[ValueStr].month + '月'
+                // onceObj.month = taskMap[ValueStr].month + '月'
+                 onceObj.month = `2季度`;
                 switch(ValueNumber) {
                     case TASKTYPEENUM.孵化器月度填报: 
                         /** 这里加限制  在月度任务中 isUpdate=true代表已经修改  isUpdate=false表示没有这个任务 详细说明看./month.ts注释*/

src/biz/mobileFuHuaQi/lease.ts

@@ -93,7 +93,7 @@ export async function zlHomeList(fhqUscc:string) {
         
         let stats = info.state == FUHUASTATE.迁出 ? "迁出" : "非迁出";//企业状态
         dataList.push({
-            enterpriseName:info.enterpriseName,//企业名称
+            enterpriseName:info.name,//企业名称
             stats,//企业状态
             htstats,//合同状态
             zjstats,//租金状态

src/biz/mobileFuHuaQi/visit.ts

@@ -106,7 +106,7 @@ export async function visitCalendarList(fuHuaQiUscc) {
     let typeMap = {};
 
     dbList.forEach(item => {
-        let {visitTime, accompany, leaderName, id} = item;
+        let {visitTime, accompany, leaderName, id, enterpriseName} = item;
         
         let dateStr = moment(visitTime).format("YYYY-MM-DD");
         if (!typeMap[dateStr]) typeMap[dateStr] = [];
@@ -115,6 +115,7 @@ export async function visitCalendarList(fuHuaQiUscc) {
             accompany,//陪同人员
             leaderName,//出席领导
             id,
+            enterpriseName,
             time:moment(visitTime).format("HH:mm")
         });
     });
@@ -150,7 +151,7 @@ export async function visitAdd(fuHuaQiUscc:string, param) {
     let addInfo = {
         id:getRandomId("zf"),
         fuHuaQiUscc,
-        enterpriseName:enterpriseInfo.enterpriseName,
+        enterpriseName:enterpriseInfo.name,
         uscc:param.uscc,
         visitTime:param.visitTime,
         accompany:param.accompany,
@@ -288,7 +289,7 @@ export async function visitDemandList(fuHuaQiUscc, demand) {
 
     /**找目标月入库的数据 */
 
-    let enterpriseCount = enterpriseData.findEnterpriseCount({fuHuaQiUscc});
+    let enterpriseCount = await enterpriseData.findEnterpriseCount({fuHuaQiUscc});
 
     // let startMs = moment().startOf("y").valueOf();
     let param:any = { fuHuaQiUscc};
@@ -316,7 +317,7 @@ export async function visitDemandAdd(fuHuaQiUscc, uscc, demand, demandDesc) {
     eccEnumValue("添加企业需求", "demand", VISITDEMAND, demand);
 
     let enterprsieInfo = await enterpriseData.findEnterpriseByUscc(uscc);
-    if (!enterprsieInfo || enterprsieInfo.uscc) {
+    if (!enterprsieInfo || !enterprsieInfo.uscc) {
         throw new BizError(ERRORENUM.该企业不存在)
     }
 
@@ -331,7 +332,7 @@ export async function visitDemandAdd(fuHuaQiUscc, uscc, demand, demandDesc) {
         id:getRandomId("qyxq"),
         fuHuaQiUscc,
         uscc,//企业uscc
-        enterpriseName:enterprsieInfo.enterpriseName,
+        enterpriseName:enterprsieInfo.name,
         createTime:new Date().valueOf(),
         enterpriseType:VISITENTERPRISETYPE.数据异常企业,//VISITENTERPRISETYPE
         demand,//企业需求
@@ -343,9 +344,9 @@ export async function visitDemandAdd(fuHuaQiUscc, uscc, demand, demandDesc) {
     return {isSuccess:true};
 }
 
-export async function visitDemandEnterpriseInfo(uscc) {
+export async function visitDemandEnterpriseInfo(id) {
 
-    let dbList = await demandData.findByParam({uscc});
+    let dbList = await demandData.findByParam({id});
 
     let dataList = [];
     dbList.forEach(item => {
@@ -371,4 +372,3 @@ export async function visitDemandDelete(id) {
     return {isSuccess:true};
 }
 
-

src/data/enterprise/enterprise.ts

@@ -356,7 +356,7 @@ export async function findSubmittedEnterpriseListByFuHuaQiUscc(fuHuaQiUscc:strin
         fuHuaQiUscc,
         "$or":[{"$and":[{"draftLock":true}, {"taskId":{"$ne":null}}]}, {"$and":[{"draftLock":false}, {"taskId":null}]}]
     };
-    return await enterpriseModel.find(selectParam, 'name logonAddress operatingAddress state');
+    return await enterpriseModel.find(selectParam, 'name logonAddress operatingAddress state uscc');
 }
 
 

src/routers/mobileClient/visit.ts

@@ -67,11 +67,11 @@ async function visit_demand_add(req, res) {
 }
 
 async function visit_demand_enterpriseinfo(req, res) {
-    let reqConf = { uscc:'String', };
-    let {uscc} = eccReqParamater(reqConf, req.body);
+    let reqConf = { id:'String', };
+    let {id} = eccReqParamater(reqConf, req.body);
     const FHQUscc = req.headers.uscc;
 
-    let userInfo = await visitBiz.visitDemandEnterpriseInfo(uscc);
+    let userInfo = await visitBiz.visitDemandEnterpriseInfo(id);
     res.success(userInfo);
 }
 

src/routers/public.ts

@@ -3,7 +3,7 @@
  */
 
 import * as asyncHandler from 'express-async-handler';
-import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE, CYCXFX, CYCSRBJ, FUHUAQICUSTOMTASKTYPE } from '../config/enum';
+import { ZLSTATISTYPE, CONTRACTTYPE, RENTTYPE, ZLSTATETYPE, VISITSTATE, VISITENTERPRISETYPE, VISITDEMAND, RESEARCHTYPE, ACTIVITYLABEL, FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE, CYCXFX, CYCSRBJ, FUHUAQICUSTOMTASKTYPE } from '../config/enum';
 import { selectLabelList } from '../data/label';
 import { GUANWEIHUIMANANGENTERPRISELABEL, LABELTYPE, LABELGOAL, FHQSYSTEMLABEL } from '../config/enum/labelEnum';
 import { NOTZHIBUTYPEENUM, ZHIBUTYPEENUM } from '../config/enum/dangJianEnum';
@@ -47,8 +47,131 @@ export function setRouter(httpServer) {
     /**6.1 */
     httpServer.post('/public/zhibutypeselect', asyncHandler(fuHuaQiZhiBuTypeSelectList) );
     httpServer.post('/public/notzhibutypeselect', asyncHandler(fuHuaQiNotZhiBuTypeSelectList) );
+
+
+    httpServer.post('/public/zlstatistype', asyncHandler(zlstatistype) );
+    httpServer.post('/public/contracttype', asyncHandler(contracttype) );
+    httpServer.post('/public/renttype', asyncHandler(renttype) );
+    httpServer.post('/public/zlstatetype', asyncHandler(zlstatetype) );
+    httpServer.post('/public/visitstate', asyncHandler(visitstate) );
+    httpServer.post('/public/visitenterprisetype', asyncHandler(visitenterprisetype) );
+    httpServer.post('/public/visitdemand', asyncHandler(visitdemand) );
+    httpServer.post('/public/researchtype', asyncHandler(researchtype) );
+    httpServer.post('/public/activitylabel', asyncHandler(activitylabel) );
+}
+
+
+async function zlstatistype(req, res) {
+    let dataList = [];
+    for (let key in ZLSTATISTYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:ZLSTATISTYPE[key]});
+        }
+    }
+    res.success({dataList});
+
+}
+
+async function contracttype(req, res) {
+    let dataList = [];
+    for (let key in CONTRACTTYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:CONTRACTTYPE[key]});
+        }
+    }
+    res.success({dataList});
+
+}
+
+async function renttype(req, res) {
+    let dataList = [];
+    for (let key in RENTTYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:RENTTYPE[key]});
+        }
+    }
+    res.success({dataList});
+}
+
+async function zlstatetype(req, res) {
+    let dataList = [];
+    for (let key in ZLSTATETYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:ZLSTATETYPE[key]});
+        }
+    }
+     res.success({dataList});
+}
+
+async function visitstate(req, res) {
+    let dataList = [];
+    for (let key in VISITSTATE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:VISITSTATE[key]});
+        }
+    }
+     res.success({dataList});
+}
+
+async function visitenterprisetype(req, res) {
+    let dataList = [];
+    for (let key in VISITENTERPRISETYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:VISITENTERPRISETYPE[key]});
+        }
+   }
+    res.success({dataList});
+}
+
+async function visitdemand(req, res) {
+    let dataList = [];
+    for (let key in VISITDEMAND) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:VISITDEMAND[key]});
+        }
+    }
+    res.success({dataList});
+}
+
+async function researchtype(req, res) {
+    let dataList = [];
+    for (let key in RESEARCHTYPE) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:RESEARCHTYPE[key]});
+        }
+    }
+    res.success({dataList});
 }
 
+async function activitylabel(req, res) {
+    let dataList = [];
+    for (let key in ACTIVITYLABEL) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:ACTIVITYLABEL[key]});
+        }
+    }
+    res.success({dataList});
+}
+
+
 /**
  * 小程序端 创业创始人背景
  * @param req