Commit 881cf5b0 by 孙香冬

no message

parent e07fd5c1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import { ERRORENUM } from "../../config/errorEnum"; import { ERRORENUM } from "../../config/errorEnum";
import { BizError } from "../../util/bizError"; import { BizError } from "../../util/bizError";
import * as monthData from "../../data/fuHuaQi/monthTable"; import * as monthData from "../../data/fuHuaQi/monthTable";
import { extractData, getTaskId } from "../../util/tools"; import { changeEnumValue, extractData, getTaskId } from "../../util/tools";
import { findAllFuHuaQiOperationNameMap } from "../../data/fuHuaQi/fuhuaqi"; import { findAllFuHuaQiOperationNameMap } from "../../data/fuHuaQi/fuhuaqi";
import { MonthConfig } from "../../config/ojbectResultKeyConfig"; import { MonthConfig } from "../../config/ojbectResultKeyConfig";
...@@ -109,15 +109,15 @@ export async function monthTableList(state:number, year:number, month:number, pa ...@@ -109,15 +109,15 @@ export async function monthTableList(state:number, year:number, month:number, pa
let dataBaseList = await monthData.findMonthTableList(selectParam, (page-1)*10 ); let dataBaseList = await monthData.findMonthTableList(selectParam, (page-1)*10 );
let count = await monthData.findMonthTableListCount(selectParam); let count = await monthData.findMonthTableListCount(selectParam);
let operationNameMap = findAllFuHuaQiOperationNameMap(); let operationNameMap = await findAllFuHuaQiOperationNameMap();
let dataList = []; let dataList = [];
dataBaseList.forEach( info => { dataBaseList.forEach( info => {
let onceInfo = { let onceInfo = {
operationName:operationNameMap[info.fuHuaQiUscc], operationName:operationNameMap[info.fuHuaQiUscc],
state:'已填报', state:info.draftLock==false?'未填报':'已填报',
time:`${info.year}${info.month}月`, time:`${info.year}${info.month}月`,
occupancyRate:info.occupancyRate occupancyRate:info.occupancyRate || '-'
}; };
dataList.push(onceInfo); dataList.push(onceInfo);
}); });
......
...@@ -62,7 +62,7 @@ async function fuHuaQiBaseList(req, res) { ...@@ -62,7 +62,7 @@ async function fuHuaQiBaseList(req, res) {
*/ */
async function getMonthList(req, res) { async function getMonthList(req, res) {
let reqConf = {state: 'Number', year: 'Number', month: 'Number', page: 'Number'}; let reqConf = {state: 'Number', year: 'Number', month: 'Number', page: 'Number'};
let { state, year, month, page } = checkReqParam(reqConf, req.body); let { state, year, month, page } = checkParamaterType(reqConf, req.body);
let result = await monthTableList(state, year, month, page); let result = await monthTableList(state, year, month, page);
res.success(result); res.success(result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment