修好一堆bug

src/biz/enterprise/enterprise.ts

@@ -7,11 +7,11 @@
 import { MoveInEnterpriseParamConfig, RegisterEnterpriseParamConfig } from "../../config/checkParamConfig";
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseInfoConfig } from "../../config/ojbectResultKeyConfig";
-import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseList, groupFindEnterprise } from "../../data/enterprise/enterprise";
+import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseList } from "../../data/enterprise/enterprise";
 import { EnterpriseListConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
 import { checkChange, checkParamater, extractData, getTaskId } from "../../util/tools"
-import { FUHUAQILV } from "../../config/enum";
+import moment = require("moment");
 
 
 /**
@@ -153,25 +153,32 @@ export async function deleteEnterpriseByUscc(uscc:string) {
  * @param page 页数
  * @returns {dataList:[], count:0}  dataList=数据列表  count:条件筛选下的数据总数
  */
-export async function enterpriseList(time:number, fuHuaQiUscc:string, industry:number, isNaturalPersonHolding:boolean, page:number) {
+export async function enterpriseList(time:string, fuHuaQiUscc:string, industry, isNaturalPersonHolding:number, page:number) {
     let selectParam:any = {};
+    if ( time.length > 0 ) {
+        let startT = moment(time).startOf('month').valueOf();
+        let endT = moment(time).endOf('month').valueOf();
+        selectParam['$or'] = [
+            {"firstIncubationTime":{'$gt':startT, '$lt':endT}},
+            {"timeOfImmigration":{'$gt':startT, '$lt':endT}},
+        ];
+    }
+
     if (time) selectParam.logonTime = time; selectParam.timeOfImmigration = time;
     if (fuHuaQiUscc) selectParam.fuHuaQiUscc = fuHuaQiUscc;
-    if (industry) selectParam.industry = industry;
-    if (isNaturalPersonHolding) selectParam.isNaturalPersonHolding = isNaturalPersonHolding;
-
-    let enterpriseMap = await groupFindEnterprise();
+    if (industry.length > 0) selectParam.industry = industry;
+    if (isNaturalPersonHolding == 2 || isNaturalPersonHolding == 3) {
+        selectParam.isNaturalPersonHolding = isNaturalPersonHolding == 2 ? true : false;
+    }
+    
     let dataBaseList = await findEnterpriseList(selectParam, (page-1)*10 );
     let count = await findEnterpriseCount(selectParam);
     let dataList = [];
     dataBaseList.forEach( info => {
         let changeData = extractData(EnterpriseListConfig, info);
-        const Count = enterpriseMap[info.uscc] || 0;
+
         dataList.push(changeData);
     });
 
-    dataBaseList.isNaturalPersonHolding = FUHUAQILV[dataBaseList.isNaturalPersonHolding];
-    dataBaseList.lv = FUHUAQILV[dataBaseList.lv];
-
     return {count, dataList};
 }
\ No newline at end of file

src/biz/enterprise/financing.ts

@@ -143,14 +143,13 @@ export async function getFuHuaQiEnterpriseForSelect(uscc:string) {
  * @param page 页数 
  * @returns 
  */
-export async function financingList(monthData:string, fuHuaQiName:string, industry, fuHuaQiInvestment:boolean, page:number) { 
+export async function financingList(monthData:string, fuHuaQiName:string, industry, fuHuaQiInvestment:number, page:number) { 
 
     let fuHuaQiUscc = "";
     if (fuHuaQiName.length > 0) {
         let fuHuaQiInfo = await findFuHuaQiByName(fuHuaQiName);
         if(fuHuaQiInfo) fuHuaQiUscc = fuHuaQiInfo.uscc;
     }
-    
 
     let selectParam:any = {};
     if ( monthData.length > 0 ) {
@@ -160,7 +159,10 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
     }
     if (industry.length >0 ) selectParam.industry = industry;
     if (fuHuaQiUscc.length > 0) selectParam.fuHuaQiUscc = fuHuaQiUscc;
-    selectParam.fuHuaQiInvestment = fuHuaQiInvestment;
+    if (fuHuaQiInvestment == 2 || fuHuaQiInvestment == 3) {
+        selectParam.fuHuaQiInvestment = fuHuaQiInvestment == 2 ? true : false;
+    }
+        
 
     let dataBaseList = await findFinancingList(selectParam, (page-1)*10 );
     let count = await findFinancingCount(selectParam);

src/routers/admin.ts

@@ -86,10 +86,10 @@ async function getMonthList(req, res) {
 /**
  * 后台管理 获取融资企业信息列表 
  * @param req 
- * @param res 
+ * @param res
  */
  async function getFinancingList(req, res) {
-    let reqConf = {monthData: 'String', fuHuaQiName: 'String', fuHuaQiInvestment: 'Boolean', industry: '[Number]', page: 'Number' };
+    let reqConf = {monthData: 'String', fuHuaQiName: 'String', fuHuaQiInvestment: 'Number', industry: '[Number]', page: 'Number' };
     let {monthData, fuHuaQiName, industry, fuHuaQiInvestment, page} = checkParamaterType(reqConf, req.body);
 
     let result = await financingBiz.financingList(monthData, fuHuaQiName, industry, fuHuaQiInvestment, page);
@@ -103,7 +103,7 @@ async function getMonthList(req, res) {
  * @param res 
  */
  async function getEnterpriseList(req, res) {
-    let reqConf = {time: 'Number', fuHuaQiUscc: 'String', industry: '[Number]', isNaturalPersonHolding: 'Boolean', page: 'Number' };
+    let reqConf = {time: 'Number', fuHuaQiUscc: 'String', industry: '[Number]', isNaturalPersonHolding: 'Number', page: 'Number' };
     let { time, fuHuaQiUscc, industry, isNaturalPersonHolding, page } = checkParamaterType(reqConf, req.body);
 
     let result = await enterpriseBiz.enterpriseList(time, fuHuaQiUscc, industry, isNaturalPersonHolding, page);