no message

src/biz/abi/partyBuilding.ts

@@ -101,28 +101,22 @@ export async function getMidScreen(year:string) {
     let clomun = ["primaryIndicators", "completionProgress"];
     let partyQuality = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {dataYear:year}, clomun);
 
-  let partyQualityList = {title:"党建质量雷达图", list:[]};
-  for (let key in enums.PRIMARYINDICATORS) {
-      let anyKey:any = key;
-      if (isNaN(anyKey)) {
-          const EnumValue = parseInt(enums.PRIMARYINDICATORS[key])
-          let completion = 0
-          let count = 0;
+    let indicatorsMap = {};
     partyQuality.forEach( info => {
         let {primaryIndicators, completionProgress} = info; //一级指标、完成进度
-              if (primaryIndicators == EnumValue) {
-                completion += completionProgress;
-                count++;
-              }
-          })
-          
-          let changeData = {
-            key:anyKey, 
-            value:Math.round((completion / count)*100)/100
-          };
-
-          partyQualityList.list.push(changeData);
+        if (!indicatorsMap[primaryIndicators]) indicatorsMap[primaryIndicators] = {count:0, completionProgress:0};
+        indicatorsMap[primaryIndicators].completionProgress += completionProgress;
+        indicatorsMap[primaryIndicators].count += 1;
+    });
+    let partyQualityList = {title:"党建质量雷达图", list:[]};//list:[{key:一级指标名称,value:一级指标数量:0}]
+    for (let key in indicatorsMap) {
+        let {count, completionProgress} = indicatorsMap[key];
+        let keyStr = enums.PRIMARYINDICATORS[key];
+        partyQualityList.list.push({ 
+                key:keyStr, 
+                value:Math.round((completionProgress / count)*100)/100
             }
+        );
     }
 
     let branchPartyQuality = {title:"各支部党建质量评分", list:[]};

src/biz/abi/target.ts

@@ -11,6 +11,7 @@ export async function getTargetData() {
     let clomun = ["tlId", "primaryIndicators", "secondaryIndicators", "thirdLevelContent", "thirdLevelScore", "currentScore", "completionProgress"];
     let partyQualityData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {}, clomun);
     
+    //todo优化一下  循环方式反了，参考partyBuilding 中的getMidScreen的写法
     let partyQualityList = [];
     for (let key in PRIMARYINDICATORS) {
         let primaryIndicatorsData = {};

src/biz/base.ts

@@ -24,7 +24,7 @@ import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
     let branch = changeEnumValue(configEnum.BRANCHNAME, bId); //支部名称
 
     let param = { bId };
-    let partyQualityScore = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量, param, ["thirdLevelScore", "currentScore"]);
+    let partyQualityScore = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, param, ["thirdLevelScore", "currentScore"]);
     
     let massIndex = 0;//得分
     let massCount = 0;//总分