no message

src/biz/admin/enterprise/enterprise.ts

@@ -58,7 +58,7 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
     selectParam["$or"] = [{"$and":[{"draftLock":true}, {"taskId":{"$ne":null}}]}, {"$and":[{"draftLock":false}, {"taskId":null}]}] ; //未提交的企业不能查看
 
     /**需要用到的查询数据 */
-    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
+    let usccMap = await fuHuaQiData.findFuHuaQiOperationNameMapByParam({});//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await enterpriseData.findEnterpriseListToPage(selectParam, (page-1)*10 );
     let count = await enterpriseData.findEnterpriseCount(selectParam);//符合查询条件的数据总数
 
@@ -177,7 +177,7 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
     }
 
     /**查询内容 */
-    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
+    let usccMap = await fuHuaQiData.findFuHuaQiOperationNameMapByParam({});//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await enterpriseData.findEnterpriseList(selectParam );
 
     /**组合二维数组  titleList 与 keyList 要一一对应 */ 
@@ -329,7 +329,7 @@ export async function enterpriseMoveOutList(name:string, fuHuaQiUscc:string, ind
     // selectParam.draftLock = true; //未提交的企业不能查看
 
     /**需要用到的查询数据 */
-    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
+    let usccMap = await fuHuaQiData.findFuHuaQiOperationNameMapByParam({});//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await enterpriseData.findEnterpriseListToPage(selectParam, (page-1)*10 );
     let count = await enterpriseData.findEnterpriseCount(selectParam);//符合查询条件的数据总数
 
@@ -396,7 +396,7 @@ export async function outPutEnterpriseMoveOutList(name:string, fuHuaQiUscc:strin
     
 
     /**需要用到的查询数据 */
-    let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
+    let usccMap = await fuHuaQiData.findFuHuaQiOperationNameMapByParam({});//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await enterpriseData.findEnterpriseList(selectParam);
 
     let keyList = [ "name", "moveOutTime", "moveOutType", "moveOutTrace","moveOutCause", "fuHuaQiUscc", "industry",

src/biz/admin/enterprise/financing.ts

@@ -46,7 +46,7 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
     /**查数据 */
     let dataBaseList = await financingData.findFinancingListToPage(selectParam, (page-1)*10 );
     let count = await financingData.findFinancingCount(selectParam);
-    let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();//用于转换所属孵化器名称
+    let usccMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});//用于转换所属孵化器名称
     
     /**拼接返回值 */
     let dataList = [];
@@ -104,7 +104,7 @@ export async function outPutFinancingList(monthData:string, fuHuaQiName:string,
 
     /**主要查询 */
     let dataBaseList = await financingData.findFinancingList(selectParam );
-    let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let usccMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     
     /**拼接返回 需要注意的是 keyList要和titleList一一对应 */
     let keyList = [

src/biz/admin/fuHuaQi/fuHuaQi.ts

@@ -397,7 +397,7 @@ export async function fuHuaQiUserList(operationName:string, page:number) {
  * @param pange 查询页面
  */
 export async function fuHuaQiScore(time:number, name:string, page:number) {
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     let param:any = {};
     if (name) {
         param.uscc = "-1";
@@ -449,7 +449,7 @@ export async function fuHuaQiScore(time:number, name:string, page:number) {
  * @param time 月份时间戳
  */
 export async function outPutFuHuaQiScore(time:number) {
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     let param:any = {};
     let outPutName = "";
     let rankList = [];

src/biz/admin/fuHuaQi/month.ts

@@ -29,7 +29,7 @@ export async function monthTableList(state:number, year:number, month:number, pa
     let dataBaseList = await monthData.findMonthTableListToPage(selectParam, (page-1)*10 );
     let count = await monthData.findMonthTableListCount(selectParam);
 
-    let operationNameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let operationNameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
 
     let dataList = [];
     dataBaseList.forEach( info => {
@@ -69,7 +69,7 @@ export async function outPutMonthTableList(state:number, year:number, month:numb
   
 
     let dataBaseList = await monthData.findMonthTableList(selectParam);
-    let operationNameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let operationNameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
 
     let keyList = [ "operationName", "state", "time", "occupancyRate"];
     let titleList = [ "运营机构名称","填报状态","数据月份","出租率(%)"];

src/biz/admin/fuHuaQi/task.ts

@@ -26,7 +26,7 @@ export async function financingTaskList(state:number, time:number, page:number)
         selectParam.year = new Date(time).getFullYear();
         selectParam.month = new Date(time).getMonth() + 1;
     }
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     
  
     let taskList = await taskData.findTaskListByParamAndPage(selectParam, (page -1)*10);
@@ -75,7 +75,7 @@ export async function outPutFinancingTaskList(state:number, time:number, type:nu
         name = "当前";
     }
 
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     
     let taskList = await taskData.findTaskListByParam(selectParam);
 
@@ -110,7 +110,7 @@ export async function addEnterpriseTaskList(state:number, time:number, page:numb
         selectParam.year = new Date(time).getFullYear();
         selectParam.month = new Date(time).getMonth() + 1;
     }
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     
  
     let taskList = await taskData.findTaskListByParamAndPage(selectParam, (page -1)*10);
@@ -159,7 +159,7 @@ export async function outPutAddEnterpriseTaskList(state:number, time:number, typ
         name = "当前";
     }
 
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
     
     let taskList = await taskData.findTaskListByParam(selectParam);
 
@@ -197,7 +197,7 @@ export async function quarterTaskList(state:number, year:number, quarter:number,
     if (quarter) selectParam.quarter = quarter;
 
     let dataBaseList = await findBusinessDataByParamToPage(selectParam, (page-1)*10);
-    let fuhuaqiNameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let fuhuaqiNameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
 
     let dataList = [];
     dataBaseList.forEach(info => {
@@ -246,7 +246,7 @@ export async function outPutQuarterTaskDataList(type:number, state:number, year:
 
 
     let dataBaseList = await findBusinessDataByParam(selectParam);
-    let fuhuaqiNameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let fuhuaqiNameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
 
     let dataList = [["运营机构名称", "填报状态", "数据填报季度", "综合收入", "投资收入", "租金收入", "财政补贴", "其他", "净利润", "纳税"]];
     dataBaseList.forEach(info => {

src/biz/admin/provide.ts

@@ -849,7 +849,7 @@ export async function changeTaskScortTimeData() {
 
 
 export async function instituQualifyNameChangeToOperationName() {
-    let nameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap()
+    let nameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({})
 
     let i18nList = await findI18nRegisterListByParam({});
     for (let i = 0; i < i18nList.length; i++) {
@@ -1282,7 +1282,7 @@ export async function outPutOnceEnterprise91310115MA1K4TB91Q() {
 /*第一次清洗企业数据 */
 export async function ETL() {
     //比对名称和uscc 有一个相同认为是同一个公司
-    let fhqNameMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();
+    let fhqNameMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});
 
     let data = onceSheetBecomeOfblockData('第一批企业数据校验结果.xlsx', 'Sheet1');
     let dataList = data[0].blockData;
@@ -1626,7 +1626,7 @@ export async function t() {
 
 export async function test111() {
     /**查询内容 */
-    let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
+    let usccMap = await fuhuaqiData.findFuHuaQiOperationNameMapByParam({});//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await findEnterpriseList({labels:{"$elemMatch": {  "labelId":"zfqy", "state":true  }} } );
 
     /**组合二维数组  titleList 与 keyList 要一一对应 */ 

src/biz/admin/stats/guanWeiHui/fuHuaQiWarning.ts

@@ -5,7 +5,7 @@
 import moment = require("moment");
 import { findMonthTableListCount, getLowOccupancyRateForMonthData, statsFuHuaQiMonthDataCount } from "../../../../data/fuHuaQi/monthTask/monthTable";
 import { findTaskCountByParamCount, statsFuHuaQiTaskReportingRate } from "../../../../data/fuHuaQi/monthTask/task";
-import { findAllFuHuaQiOperationNameMap, findFuHuaQiFilesDataByParam } from "../../../../data/fuHuaQi/fuhuaqi";
+import { findFuHuaQiOperationNameMapByParam, findFuHuaQiFilesDataByParam } from "../../../../data/fuHuaQi/fuhuaqi";
 import { findBusinessDataByParam } from "../../../../data/fuHuaQi/quarterTask/businessData";
 import { statsEnterTeamDataByFHQ } from "../../../../data/enterprise/quarterTask/team";
 import { statsFHQHaveEnterpriseCount } from "../../../../data/enterprise/enterprise";
@@ -16,7 +16,7 @@ import { statsFHQHaveEnterpriseCount } from "../../../../data/enterprise/enterpr
  * @returns 
  */
 export async function fuHuaQiWarningOverView() {
-    let fuHuaQiNameMap = await findAllFuHuaQiOperationNameMap();
+    let fuHuaQiNameMap = await findFuHuaQiOperationNameMapByParam({});
     let dataYear = moment().subtract(1, 'months').year();
     let dataMonth = moment().subtract(1, 'months').month();
 
@@ -76,7 +76,7 @@ export async function fuHuaQiWarningOverView() {
  * @param page
  */
 export async function revenueAnomaly(page:number) {
-    let fuHuaQiNameMap = await findAllFuHuaQiOperationNameMap();
+    let fuHuaQiNameMap = await findFuHuaQiOperationNameMapByParam({});
     let fuHuaQiAcreList = await findFuHuaQiFilesDataByParam({}, {hatchingGround:1, incubatedAcreage:1, uscc:1});
 
     let expMap = {};//目标值
@@ -160,7 +160,7 @@ async function getRevenueAnomalyCount() {
  * @param page 
  */
 export async function fuHuaQiTPAnomaly(page:number) {
-    let fuHuaQiNameMap = await findAllFuHuaQiOperationNameMap();
+    let fuHuaQiNameMap = await findFuHuaQiOperationNameMapByParam({});
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     let param = {quarter:declarationQuarter, year:declarationYear, "$or":[
@@ -239,7 +239,7 @@ async function getFuHuaQiTPAnomalyCount(fuHuaQiNameMap) {
  * @param month 
  */
 export async function teamAnomaly(page:number) {
-    let fuHuaQiNameMap = await findAllFuHuaQiOperationNameMap();
+    let fuHuaQiNameMap = await findFuHuaQiOperationNameMapByParam({});
     let {declarationQuarter, declarationYear} = getDeclarationTime();
     let memberCountMap = await statsEnterTeamDataByFHQ(declarationYear, declarationQuarter);
     let enterpriseCountMap = await statsFHQHaveEnterpriseCount();

src/biz/mobileEnterprise/policy.ts

@@ -5,7 +5,7 @@
 import moment = require("moment");
 import * as informationDat from "../../data/guanWeiHui/information";
 import { addEnterprisePoint } from "../point";
-import { ENTERPRISENODEENUM, POINTTYPEENUM } from "../../config/pointConfig";
+import { ENTERPRISENODEENUM } from "../../config/pointConfig";
 
 
 /**

src/biz/mobileFuHuaQi/fuHuaQi/score.ts

@@ -8,7 +8,7 @@ import moment = require("moment");
 import { CHANGEMODE, SCOREWAYS, TASKTYPEENUM } from "../../../config/enum";
 import { FuHuaQiMyDataScoreConfig, ScoreConfig, FuHuaQiBaseDataScoreConfig, EnterpriseScoreConfig, StarConfig } from "../../../config/scoreConfig";
 import { findEnterpriseList } from "../../../data/enterprise/enterprise";
-import { findAllFuHuaQiOperationNameMap, findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
+import { findFuHuaQiOperationNameMapByParam, findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
 import * as scoreData from "../../../data/fuHuaQi/score";
 import  * as scoreLogData from "../../../data/fuHuaQi/scoreLog";
 
@@ -266,7 +266,7 @@ function waysStr(ways:number, type:number, changeMode) {
  */
 export async function rankList(uscc:string) {
     let dataList = await scoreData.findScoreDataByParam({});
-    let nameMap = await findAllFuHuaQiOperationNameMap();
+    let nameMap = await findFuHuaQiOperationNameMapByParam({});
 
     let rankList = [];
    

src/biz/mobileGuanWeiHui/fuHuaQiManage/task.ts

@@ -7,7 +7,7 @@ import moment = require("moment");
 import { TASKTYPEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { fuHuaQiEnterpairseCount } from "../../../data/enterprise/enterprise";
-import { findFuHuaQiOperationNameMapByOperationName } from "../../../data/fuHuaQi/fuhuaqi";
+import { findFuHuaQiOperationNameMapByParam } from "../../../data/fuHuaQi/fuhuaqi";
 import { statsFinancingEnterpriseAndCount } from "../../../data/fuHuaQi/monthTask/financing";
 import { findMonthTableList } from "../../../data/fuHuaQi/monthTask/monthTable";
 import { distinctCycle, findTaskListByParam } from "../../../data/fuHuaQi/monthTask/task";
@@ -110,7 +110,7 @@ export async function taskList(submitType:number, taskYear:number, taskMonth:num
 
     let nameMapParam = {};
     if (name) nameMapParam = {operationName: {"$regex":`${name}`} };
-    let fhqNameMap = await findFuHuaQiOperationNameMapByOperationName(nameMapParam);
+    let fhqNameMap = await findFuHuaQiOperationNameMapByParam(nameMapParam);
     let allDataList = [];
 
     for (let uscc in fuHuaQiMap) {

src/biz/systemTask.ts

@@ -21,7 +21,7 @@ import { findQuarterTaskCountByParam } from "../data/fuHuaQi/quarterTask/quarter
 import { provideFuHuaQiQuarterTask } from "./mobileFuHuaQi/fuHuaQi/task/quarterTask";
 import { initSystemLabelData, systemLabel } from "./label";
 const os = require('os');
- 
+
 
 
 /**

src/data/fuHuaQi/fuhuaqi.ts

@@ -9,7 +9,6 @@
 
 import {Schema} from 'mongoose';
 import { baseDB } from '../../db/mongo/dbInit';
-import { deflate } from 'zlib';
 
 const foundingTeamSchema = new Schema({
     memberName:String,//成员姓名
@@ -90,7 +89,9 @@ const fuHuaQiSchema = new Schema({
     /**标签系统 */
     labels:{type:[labelSchema], default:[]},
     /**2024年6月 */
-    caiLiHuGuanDi:{type:String, default:""}//财力户管地
+    caiLiHuGuanDi:{type:String, default:""},//财力户管地
+    /**孵化器是否测试账号 */
+    isTest:{type:Boolean, default:false}
 });
 
 var fuHuaQiModel;
@@ -142,6 +143,7 @@ export async function findFuHuaQiByName(name:string) {
  * @returns [] 孵化器列表
  */
 export async function findFuHuaQiListByPage(selectParam, skipCount) {
+    selectParam.isTest = null;
     return await fuHuaQiModel.find(selectParam).skip(skipCount).limit(10);
 }
 
@@ -152,6 +154,7 @@ export async function findFuHuaQiListByPage(selectParam, skipCount) {
  * @returns [] 孵化器列表
  */
 export async function findFuHuaQiList(selectParam) {
+    selectParam.isTest = null;
     return await fuHuaQiModel.find(selectParam);
 }
 
@@ -162,36 +165,38 @@ export async function findFuHuaQiList(selectParam) {
  * @returns number 数据数量
  */
 export async function findFuHuaQiCount(selectParam) {
+    selectParam.isTest = null;
     return await fuHuaQiModel.find(selectParam).countDocuments();
 }
 
 
 /**
- * 获取所有运营机构名称的map
- * @returns map key:统一信用代码 value:运营机构名称
- */
-export async function findAllFuHuaQiOperationNameMap() {
-    let dataList = await fuHuaQiModel.find({});
-    let map = {};
-    dataList.forEach(info => {
-        map[info.uscc] = info.operationName;
-    });
-    return map;
-}
-
-
-/**
- * 获取所有运营机构名称的map
- * @returns map key:统一信用代码 value:运营机构名称
- */
-export async function findFuHuaQiOperationNameMapByOperationName(param) {
-    let dataList = await fuHuaQiModel.find(param);
-    let map = {};
-    dataList.forEach(info => {
-        map[info.uscc] = info.operationName;
-    });
-    return map;
-}
+//  * 获取所有运营机构名称的map
+//  * @returns map key:统一信用代码 value:运营机构名称
+//  */
+// export async function findAllFuHuaQiOperationNameMap(param) {
+//     let dataList = await fuHuaQiModel.find({isTest : null});
+//     let map = {};
+//     dataList.forEach(info => {
+//         map[info.uscc] = info.operationName;
+//     });
+//     return map;
+// }
+
+
+// /**
+//  * 获取所有运营机构名称的map
+//  * @returns map key:统一信用代码 value:运营机构名称
+//  */
+// export async function findFuHuaQiOperationNameMap(param) {
+//     param.isTest = null;
+//     let dataList = await fuHuaQiModel.find(param);
+//     let map = {};
+//     dataList.forEach(info => {
+//         map[info.uscc] = info.operationName;
+//     });
+//     return map;
+// }
 
 
 /**
@@ -199,6 +204,7 @@ export async function findFuHuaQiOperationNameMapByOperationName(param) {
  * @returns map key:统一信用代码 value:运营机构名称
  */
 export async function findFuHuaQiOperationNameMapByParam(param) {
+    param.isTest = null;
     let dataList = await fuHuaQiModel.find(param);
     let map = {};
     dataList.forEach(info => {