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

src/biz/enterprise/enterprise.ts

@@ -137,16 +137,16 @@ export async function deleteEnterpriseByUscc(uscc:string) {
 /**
  * 获取在孵企业信息列表
  * @param time 新注册时间/迁入时间
- * @param belongToIncubator 所属孵化器 
+ * @param fuHuaQiUscc 所属孵化器 
  * @param industry 行业领域
  * @param isNaturalPersonHolding 自然人控股
  * @param page 页数
  * @returns 
  */
-export async function enterpriseList(time:number, belongToIncubator:number, industry:number, isNaturalPersonHolding:boolean, page:number) {
+export async function enterpriseList(time:number, fuHuaQiUscc:string, industry:number, isNaturalPersonHolding:boolean, page:number) {
     let selectParam:any = {};
     if (time) selectParam.logonTime = time; selectParam.timeOfImmigration = time;
-    if (belongToIncubator) selectParam.belongToIncubator = belongToIncubator;
+    if (fuHuaQiUscc) selectParam.fuHuaQiUscc = fuHuaQiUscc;
     if (industry) selectParam.industry = industry;
     if (isNaturalPersonHolding) selectParam.isNaturalPersonHolding = isNaturalPersonHolding;
 

src/biz/enterprise/financing.ts

@@ -119,16 +119,16 @@ export async function getFinancingByName(uscc:string) {
 /**
  * 融资企业信息列表
  * @param month 数据月份 目前数据库没有该字段
- * @param belongToIncubator 所属孵化器 
+ * @param fuHuaQiUscc 孵化器信用代码 
  * @param industry 行业领域
  * @param fuHuaQiInvestment 孵化器是否参与投资
  * @param page 页数 
  * @returns 
  */
-export async function financingList(month:string, belongToIncubator:number, industry:string, fuHuaQiInvestment:boolean, page:number) {
+export async function financingList(month:string, fuHuaQiUscc:string, industry:string, fuHuaQiInvestment:boolean, page:number) {
     let selectParam:any = {};
     if (month) selectParam.month = month;
-    if (belongToIncubator) selectParam.belongToIncubator = belongToIncubator;
+    if (fuHuaQiUscc) selectParam.fuHuaQiUscc = fuHuaQiUscc;
     if (industry) selectParam.industry = industry;
     if (fuHuaQiInvestment) selectParam.fuHuaQiInvestment = fuHuaQiInvestment;
 

src/biz/fuHuqQi/base.ts

@@ -6,8 +6,8 @@
  */
 import moment = require("moment");
 import { BaseParamUpdateConfig } from "../../config/checkParamConfig";
-import { findEnterpriseCountByFuHuaQiUscc, groupFindEnterprise } from "../../data/enterprise/enterprise";
-import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiList } from "../../data/fuHuaQi/fuhuaqi";
+import { findEnterpriseCount, findEnterpriseCountByFuHuaQiUscc, groupFindEnterprise } from "../../data/enterprise/enterprise";
+import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiList, groupFindFuHuaQi } from "../../data/fuHuaQi/fuhuaqi";
 import * as tools from "../../util/tools";
 import { FuHuaQiBaseListConfig } from "../../config/ojbectResultKeyConfig";
 
@@ -42,7 +42,8 @@ export async function updateFuHuaQiBaseData(uscc:string, param) {
  */
 export async function selectFuHuaQiBaseData(uscc:string) {
     let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
-
+    let enterpriseTotal = await findEnterpriseCount({fuHuaQiUscc:uscc}); //企业总数
+    let numOfEntities = enterpriseTotal - dataBaseInfo.virtualEnterpriseNum; //企业总数 - 虚拟企业数量
     let keyList = [ 
         "name", "operationName", "uscc", "virtualEnterpriseNum", "logonTime", "incubatedAcreage", "acreageTotal", "acreagePersonalUse", 
         "lv", "identificationTime","industry","institutionalNature","liaison","liaisonPhone","personInCharge","personInChargePhone",
@@ -51,6 +52,8 @@ export async function selectFuHuaQiBaseData(uscc:string) {
 
     keyList.forEach( key => {
         data[key] = dataBaseInfo[key];
+        data["enterpriseTotal"] = enterpriseTotal;
+        data["numOfEntities"] = numOfEntities;
     });
 
     return data;

src/biz/fuHuqQi/user.ts

@@ -123,6 +123,11 @@ export async function logout(uscc:string):Promise<object> {
 /**
  * 修改账号状态
  */
-export async function updateState(userStatem, uscc) {
-    
+export async function updateState(userStatem:boolean, uscc:string) {
+    let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(uscc);
+    if(!fuhuaqiInfo) throw new BizError(ERRORENUM.账号不存在);
+    fuhuaqiInfo.userStatem = userStatem;
+    await fuhuaqiInfo.save();
+    console.log(await fuhuaqiInfo.save());
+    return {isSuccess:true};
 }
\ No newline at end of file

src/config/ojbectResultKeyConfig.ts

@@ -103,6 +103,7 @@ export const FuHuaQiListConfig = {
     liaison:{key:"联系人"},
     liaisonPhone:{key:"负责人"},
     personInChargePhone:{key:"负责人联系电话"},
+    userState:{key:"账号状态"}
 }
 
 

src/data/enterprise/enterprise.ts

@@ -23,7 +23,6 @@ const enterpriseSchema = new Schema({
     leasedArea:Number,//租赁面积（平方米）
     draftLock:{type:Boolean, default:false},//草稿锁，true为提交之后，false为草稿
     createTime:Number,//录入时间
-    belongToIncubator:[Number],//所属孵化器 
 });
 
 var enterpriseModel;
@@ -131,6 +130,10 @@ export async function deleteEnterprise(uscc:string) {
     return await enterpriseModel.find(selectParam).skip(skipCount).limit(10);
 }
 
+export async function findEnterprise(selectParam) {
+    return await enterpriseModel.find(selectParam);
+}
+
 /**
  * 获取所有孵化器
  * @param selectParam 查询参数

src/data/fuHuaQi/fuhuaqi.ts

@@ -153,6 +153,7 @@ export async function findAllFuHuaQiOperationNameMap() {
     return result;
 }
 
+
 /**
  * 获取所有孵化器
  * @param selectParam 查询参数

src/routers/admin.ts

@@ -76,11 +76,11 @@ async function fuHuaQiBaseList(req, res) {
  * @param res 
  */
  async function getFinancingList(req, res) {
-    let reqConf = {month: 'string', belongToIncubator: 'string', industry: 'string', fuHuaQiInvestment: 'boolean', page: 'number' };
-    let { month, belongToIncubator, industry, fuHuaQiInvestment, page } = checkReqParam(reqConf, req.body);
+    let reqConf = {month: 'string', fuHuaQiUscc: 'string', industry: 'string', fuHuaQiInvestment: 'boolean', page: 'number' };
+    let { month, fuHuaQiUscc, industry, fuHuaQiInvestment, page } = checkReqParam(reqConf, req.body);
     const Uscc = req.headers.uscc;
 
-    let result = await financingBiz.financingList(month, belongToIncubator, industry, fuHuaQiInvestment, page);
+    let result = await financingBiz.financingList(month, fuHuaQiUscc, industry, fuHuaQiInvestment, page);
     res.success(result);
 }
 
@@ -91,7 +91,7 @@ async function fuHuaQiBaseList(req, res) {
  * @param res 
  */
  async function getEnterpriseList(req, res) {
-    let reqConf = {logonTime: 'number', timeOfImmigration: 'number', fuHuaQiUscc: 'string', industry: 'number', isNaturalPersonHolding: 'boolean', page: 'number' };
+    let reqConf = {time: 'number', fuHuaQiUscc: 'string', industry: 'number', isNaturalPersonHolding: 'boolean', page: 'number' };
     let { time, fuHuaQiUscc, industry, isNaturalPersonHolding, page } = checkReqParam(reqConf, req.body);
     const Uscc = req.headers.uscc;
 
@@ -106,7 +106,7 @@ async function fuHuaQiBaseList(req, res) {
  * @param res 
  */
  async function updateState(req, res) {
-    let reqConf = {userState: 'number', uscc: 'string' };
+    let reqConf = {userState: 'boolean', uscc: 'string' };
     let { userState, uscc } = checkReqParam(reqConf, req.body);
     const Uscc = req.headers.uscc;