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

# Conflicts:
#	src/biz/fuHuqQi/task.ts
#	src/data/fuHuaQi/task.ts

src/biz/enterprise/financing.ts

@@ -7,7 +7,7 @@
 
 import { FinancingParamConfig } from "../../config/checkParamConfig";
 import { ERRORENUM } from "../../config/errorEnum";
-import { EnterpriseFinancingInfoConfig, EnterpriseInfoConfig } from "../../config/ojbectResultKeyConfig";
+import { EnterpriseFinancingInfoConfig } from "../../config/ojbectResultKeyConfig";
 import { createFinancing, deleteEnterpriseFinancing, findAddByName, findEnterpriseFinancingByUscc, findFinancingByName, findFinancingCount, findFinancingInfoByTaskIdAndSucc, findFinancingList, groupFindFinancing } from "../../data/enterprise/financing";
 import { FinancingListConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
@@ -120,15 +120,17 @@ export async function getAddByName(name:string) {
 /**
  * 融资企业信息列表
  * @param month 数据月份 目前数据库没有该字段
- * @param fuHuaQiUscc 孵化器统一信用代码 实际参数是所属孵化器 
- * @param industry 行业领域 根据孵化器信用代码查找 fuhuaqi表的领域
+ * @param belongToIncubator 所属孵化器 
+ * @param industry 行业领域
  * @param fuHuaQiInvestment 孵化器是否参与投资
  * @param page 页数 
  * @returns 
  */
-export async function financingList(fuHuaQiUscc:string, fuHuaQiInvestment:boolean, page:number) {
+export async function financingList(month:string, belongToIncubator:string, industry:string, fuHuaQiInvestment:boolean, page:number) {
     let selectParam:any = {};
-    if (fuHuaQiUscc) selectParam.fuHuaQiUscc = fuHuaQiUscc;
+    if (month) selectParam.month = month;
+    if (belongToIncubator) selectParam.belongToIncubator = belongToIncubator;
+    if (industry) selectParam.industry = industry;
     if (fuHuaQiInvestment) selectParam.fuHuaQiInvestment = fuHuaQiInvestment;
 
     let enterpriseMap = await groupFindFinancing();

src/biz/fuHuqQi/task.ts

@@ -7,6 +7,7 @@
 
 import { TASKTYPEENUM } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
+import { TaskListConfig } from "../../config/ojbectResultKeyConfig";
 import { findEnterpriseListByTaskId, updateEnterpriseDraftLock } from "../../data/enterprise/enterprise";
 import { findFinancingListByTaskId, updateFinancingDraftLock } from "../../data/enterprise/financing";
 import { findAllFuHuaQi } from "../../data/fuHuaQi/fuhuaqi";
@@ -14,7 +15,7 @@ import { findmonthTableByTaskId, findmonthTableListByTaskId } from "../../data/f
 import { createTaskData, createTaskToList, findFuHuaQiTaskByKeyAndUscc, findTaskCountByKey } from "../../data/fuHuaQi/task";
 import { BizError } from "../../util/bizError";
 import { logConsole, logHandle } from "../../util/log";
-import { getTaskId, getTimeKey } from "../../util/tools";
+import { extractData, getTaskId, getTimeKey } from "../../util/tools";
 
 
 /**
@@ -141,3 +142,18 @@ export async function provideTask() {
     }
 
 }
+
+
+/**
+ * 根据uscc查询任务信息 
+ * @param uscc 企业统一信用代码
+ */
+ export async function getTaskByUscc(uscc:string) {
+    const TaskId = getTaskId(uscc);
+    let dataBaseInfo = await findmonthTableByTaskId(TaskId);
+    if (!dataBaseInfo) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业`);
+
+    let data = extractData(TaskListConfig, dataBaseInfo);
+
+    return {data};
+}
\ No newline at end of file

src/config/ojbectResultKeyConfig.ts

@@ -78,6 +78,9 @@ export const EnterpriseFinancingInfoConfig = {
     leasedArea:{key:"租赁面积（平方米）"},
 };
 
+/**
+ * 企业融资信息 参数转换配置
+ */
 export const FinancingListConfig = {
     name:{key:"企业名称"},
     logonAdd:{key:"注册地址"},
@@ -91,6 +94,9 @@ export const FinancingListConfig = {
     createTime:{key:"录入时间 不可修改"},
 }
 
+/**
+ * 孵化器账号  参数转换配置
+ */
 export const FuHuaQiListConfig = {
     operationName:{key:"运营机构名称 不可修改"},
     uscc:{key:"营业执照"},
@@ -98,3 +104,15 @@ export const FuHuaQiListConfig = {
     liaisonPhone:{key:"负责人"},
     personInChargePhone:{key:"负责人联系电话"},
 }
+
+
+/**
+ * 孵化器任务信息 参数转换配置
+ */
+export const TaskListConfig = {
+    name:{key:"任务名称"},
+    fuHuaQiUscc:{key:"任务所属孵化器id"},
+    occupancyRate:{key:"出租率"},
+    liaisonPhone:{key:"负责人"},
+    createTime:{key:"创建时间"},
+}

src/data/enterprise/financing.ts

@@ -25,7 +25,7 @@ const financingSchema = new Schema({
     year:String,//数据年份
     month:String,//数据月份
     industry:[Number],//领域
-    
+    belongToIncubator:String, //所属孵化器
 });
 
 var financingModel;

src/data/fuHuaQi/task.ts

@@ -57,6 +57,20 @@ export async function findTaskCountByKey(key:string) {
     return await fuHuaQiTaskModel.find({key}).count();
 }
 
+
+
 export async function createTaskToList(taskList:object) {
     await fuHuaQiTaskModel.insertMany(taskList);
 }
+
+
+/**
+ * 通过任务id获取任务信息
+ * 支持.save方法保存对象修改
+ * @param taskId 任务id
+ * @returns {}
+ */
+ export async function findEnterpriseByUscc(taskId:string) {
+    return await fuHuaQiTaskModel.selectOnceData({taskId});
+}
+

src/routers/admin.ts

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

src/routers/fuhuaqi.ts

@@ -22,6 +22,7 @@ export function setRouter(httpServer) {
     /**任务 */
     httpServer.post('/fuhuaqi/task/list', checkFuHuaQiToken, asyncHandler(taskList));
     httpServer.post('/fuhuaqi/task/submit', checkFuHuaQiToken, asyncHandler(submitTask));
+    httpServer.post('/fuhuaqi/task/select', checkFuHuaQiToken, asyncHandler(selectTaskInfo));
     /**月度报表 */
     httpServer.post('/fuhuaqi/month/addreport', checkFuHuaQiToken, asyncHandler(addReport));
     httpServer.post('/fuhuaqi/month/updatereport', checkFuHuaQiToken, asyncHandler(updateReport));
@@ -318,6 +319,20 @@ async function submitTask(req, res) {
 
 
 /**
+ * 查询迁入企业登记信息或新建企业登录信息 
+ * @param req 
+ * @param res 
+ */
+ async function selectTaskInfo(req, res) {
+    let reqConf = {uscc: 'String' };
+    let { uscc } = checkReqParam(reqConf, req.body);
+
+    let result = await taskBiz.getTaskByUscc(uscc);
+    res.success(result);
+}
+
+
+/**
  * 更新基础数据
  * @param req 
  * @param res