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

src/biz/fuHuqQi/month.ts

@@ -7,7 +7,7 @@
 import { ERRORENUM } from "../../config/errorEnum";
 import { BizError } from "../../util/bizError";
 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 { MonthConfig } from "../../config/ojbectResultKeyConfig";
 
@@ -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 count = await monthData.findMonthTableListCount(selectParam);
 
-    let operationNameMap = findAllFuHuaQiOperationNameMap();
+    let operationNameMap = await findAllFuHuaQiOperationNameMap();
 
     let dataList = [];
     dataBaseList.forEach( info => {
         let onceInfo = {
             operationName:operationNameMap[info.fuHuaQiUscc],
-            state:'已填报',
+            state:info.draftLock==false?'未填报':'已填报',
             time:`${info.year}年${info.month}月`,
-            occupancyRate:info.occupancyRate
+            occupancyRate:info.occupancyRate ||  '-'
         };
         dataList.push(onceInfo);
     });

src/routers/admin.ts

@@ -62,7 +62,7 @@ async function fuHuaQiBaseList(req, res) {
  */
 async function getMonthList(req, res) {
     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);
     res.success(result);