no message

src/biz/admin.ts

@@ -19,7 +19,7 @@ import { on } from "process";
 import { systemConfig } from "../config/serverConfig";
 
 export async function allEnterpriseNameList() {
-    let listList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业基础信息表, {state:1}, ["enterpriseName", "eId"]);
+    let listList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业基础信息表, {state:enumConfig.CHANGESTATE.已通过}, ["enterpriseName", "eId"]);
 
     let dataList = [];
     listList.forEach(info => {
@@ -93,7 +93,7 @@ export async function enterpriseExamineList(year:number, enterpriseName:string,
     let selectParam:any = {};
     if (year) selectParam = {annual:getMySqlMs(year)};
 
-    let filesList = [ "mId", "annual",  "BI", "TXP", "RD", "state"];
+    let filesList = [ "mId", "annual", "quarter",  "BI", "TXP", "RD", "state"];
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName"], where:{} };
     if (enterpriseName) {
@@ -109,6 +109,7 @@ export async function enterpriseExamineList(year:number, enterpriseName:string,
             enterpriseName:info.enterprise.enterpriseName,
             mId:info.mId,
             annual:moment(info.annual).format("YYYY"),
+            quarter: changeEnumValue(enumConfig.QUARTER, info.quarter),
             BI:info.BI,
             TXP:info.TXP,
             RD:info.RD,
@@ -181,14 +182,7 @@ export async function enterpriseExamineUpdate( mId, param) {
 // --------------------------------------经营数据
 export async function enterpriseManageList(enterpriseName:string, year:number, page:number) {
     let selectParam:any = {isSubmit:enumConfig.STATE.是};
-
-    // let selectParam:any = {};
-    // if (year) {
-    //     selectParam.annual = getMySqlMs(year);
-    // }
-    if (year) {
-        selectParam.annual = `${moment(year).format("YYYY")}-01-01 00:00:00`;
-    }
+    if (year) selectParam.annual = `${moment(year).format("YYYY")}-01-01 00:00:00`;
 
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column: ["enterpriseName", "uscc", "eId"], where:{} };
@@ -203,22 +197,19 @@ export async function enterpriseManageList(enterpriseName:string, year:number, p
     let resData = [];
     resInfo.forEach( info => {
         let {BI, mId, TXP, RD, annual, quarter, enterprise} = info;
-
         let quarterStr = "第一季度";
-        if (quarter ) quarterStr = changeEnumValue(enumConfig.QUARTER, quarter);  
+        if (quarter) quarterStr = changeEnumValue(enumConfig.QUARTER, quarter);  
         let year = moment(annual).format("YYYY");
-        resData.push({BI, mId, TXP,RD,annual:year, quarterStr, enterprise, yearStr:`${year}${quarter}`});
+        resData.push({BI, mId, TXP, RD, annual:year, quarter, enterprise, quarterStr});
     })
     
     resData.sort( (a, b) => {
-        return b.yearStr - a.yearStr;
+        return b.annual - a.annual || b.quarter - a.quarter;
     })
 
     let dataList = [];
     resData.forEach(info => {
-        let {BI, mId, TXP, RD, annual, quarter, enterprise} = info;
-        let quarterStr = "第一季度";
-        if (quarter ) quarterStr = changeEnumValue(enumConfig.QUARTER, quarter);
+        let {BI, mId, TXP, RD, annual, quarter, enterprise, quarterStr} = info;
         
         let dataInfo = {
             eId:enterprise.eId, //企业id
@@ -228,8 +219,6 @@ export async function enterpriseManageList(enterpriseName:string, year:number, p
             TXP:TXP, //纳税（万元）
             RD:RD,//研发投入（万元）
             annual:`${moment(annual).format("YYYY")}-${quarterStr}`,//年度
-            // quarter:changeEnumValue(enumConfig.QUARTER, quarter),//新增季度
-            // state:state ? "已审核" : "未审核",
             mId:mId
         };
         dataList.push(dataInfo);
@@ -240,16 +229,14 @@ export async function enterpriseManageList(enterpriseName:string, year:number, p
 
 
 export async function outPutEnterpriseManageList(enterpriseName:string, year:number, type:number, files) {
-    let selectParam:any = {};
+    let selectParam:any = {isSubmit:enumConfig.STATE.是};
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column: ["enterpriseName", "uscc", "eId"], where:{} };
 
     if (type == 1) {
+        if (year) selectParam.annual = `${moment(year).format("YYYY")}-01-01 00:00:00`;
         if (enterpriseName) {
-            manyTableInfo[TABLENAME.企业基础信息表].where = {"enterpriseName": {"%like%":enterpriseName}}
-        }
-        if (year) {
-            selectParam.annual = `${moment(year).format("YYYY")}-01-01 00:00:00`;
+            manyTableInfo[TABLENAME.企业基础信息表].where["enterpriseName"] = {"%like%":enterpriseName}
         }
     }
 
@@ -264,13 +251,23 @@ export async function outPutEnterpriseManageList(enterpriseName:string, year:num
     });
     dataList.push(titleList);
 
-    resInfo.forEach(info => {
-        let {BI, mId, TXP, RD,  annual, quarter,  enterprise} = info;
+    let resData = [];
+    resInfo.forEach( info => {
+        let {BI, mId, TXP, RD, annual, quarter, enterprise} = info;
         let quarterStr = "第一季度";
-        if (quarter ) quarterStr = changeEnumValue(enumConfig.QUARTER, quarter);
+        if (quarter) quarterStr = changeEnumValue(enumConfig.QUARTER, quarter);  
+
+        let year = moment(annual).format("YYYY");
+        resData.push({BI, mId, TXP, RD, annual:year, quarter, enterprise, quarterStr});
+    })
     
+    resData.sort( (a, b) => {
+        return b.annual - a.annual || b.quarter - a.quarter;
+    })
+
+    resData.forEach(info => {
         let subList = [];
-        // let stateStr = state ? "已审核" : "未审核";
+        let {BI, mId, TXP, RD, annual, quarter, enterprise, quarterStr} = info;
         valueList.forEach(subInfo => {
             if (subInfo == "enterpriseName") subList.push(enterprise.enterpriseName);
             if (subInfo == "uscc") subList.push(enterprise.uscc);
@@ -278,8 +275,6 @@ export async function outPutEnterpriseManageList(enterpriseName:string, year:num
             if (subInfo == "TXP") subList.push(TXP);
             if (subInfo == "RD") subList.push(RD);