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

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

src/biz/fuHuqQi/task.ts

@@ -12,7 +12,7 @@ import { findEnterpriseListByTaskId, updateEnterpriseDraftLock } from "../../dat
 import { findFinancingListByTaskId, updateFinancingDraftLock } from "../../data/enterprise/financing";
 import { findAllFuHuaQi } from "../../data/fuHuaQi/fuhuaqi";
 import { findmonthTableByTaskId, findmonthTableListByTaskId } from "../../data/fuHuaQi/monthTable";
-import { findEnterpriseByTaskIdAndType, createTaskToList, findFuHuaQiTaskByTaskId, findTaskCountByKey } from "../../data/fuHuaQi/task";
+import { findEnterpriseByTaskIdAndType, createTaskToList, findFuHuaQiTaskByTaskId, findTaskByTaskId, findTaskCountByKey } from "../../data/fuHuaQi/task";
 import { BizError } from "../../util/bizError";
 import { logConsole, logHandle } from "../../util/log";
 import { extractData, getTaskId, getTimeKey } from "../../util/tools";
@@ -157,7 +157,7 @@ export async function provideTask() {
  */
  export async function getTaskByUscc(uscc:string) {
     const TaskId = getTaskId(uscc);
-    let dataBaseInfo = await findmonthTableByTaskId(TaskId);
+    let dataBaseInfo = await findTaskByTaskId(TaskId);
     if (!dataBaseInfo) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业`);
 
     let data = extractData(TaskListConfig, dataBaseInfo);

src/data/fuHuaQi/task.ts

@@ -85,7 +85,7 @@ export async function createTaskToList(taskList:object) {
  * @param taskId 任务id
  * @returns {}
  */
- export async function findEnterpriseByUscc(taskId:string) {
+ export async function findTaskByTaskId(taskId:string) {
     return await fuHuaQiTaskModel.selectOnceData({taskId});
 }