Sfoglia il codice sorgente

修改百分比导致的问题

lixing 3 anni fa
parent
commit
aa71b2a19d

+ 1 - 1
src/main/java/com/persagy/apm/report/dependencies/iotdataanalysis/service/impl/IDataAnalysisWebServiceImpl.java

@@ -34,7 +34,7 @@ public class IDataAnalysisWebServiceImpl implements IDataAnalysisWebService {
 //                        projectId = "Pj1101080259";
             paramObject.put("groupCode", groupCode);
             paramObject.put("projectIdList", Lists.newArrayList(projectId));
-            Date startTime = DateUtils.getStartTimeOfDay(date);
+            Date startTime = DateUtils.getFirstDayOfMonth(date);
             Date endTime = DateUtils.getMonthOff(startTime, 1);
             paramObject.put("alarmStartTime", startTime);
             paramObject.put("alarmEndTime", endTime);

+ 2 - 2
src/main/java/com/persagy/apm/report/indicator/factory/EnergyEfficiencyFactory.java

@@ -130,12 +130,12 @@ public class EnergyEfficiencyFactory {
     public AttrValueVO getUnqualifiedProportion(Double projectCount, Double unqualifiedCount) {
         if (projectCount == null || unqualifiedCount == null) {
             return new AttrValueVO(AreaEnergyEfficiencyContentCodes.unqualifiedProportion.name(),
-                    null, AttrValueTypeEnum.number_2);
+                    null, AttrValueTypeEnum.percent_2);
         }
 
         return new AttrValueVO(AreaEnergyEfficiencyContentCodes.unqualifiedProportion.name(),
                 String.valueOf(DataUtils.doubleDivide(unqualifiedCount, projectCount)),
-                AttrValueTypeEnum.number_2, DataConstants.PERCENT);
+                AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
     }
 
     /**

+ 3 - 1
src/main/java/com/persagy/apm/report/indicator/factory/EnvFactory.java

@@ -254,7 +254,9 @@ public class EnvFactory {
         }
         // 获取达标率标准判断条件
         StatisticItem statisticItem = statisticItemService.getItemByCode(StatisticCodeEnum.ENV_QUALIFIED_PROPORTION.name());
-        Double qualifyResult = DataUtils.getQualifyResult(standardValue, statisticItem.getQualifyFormula(), currentMonth);
+        // 本月达标率为百分比取值,应先除100之后再与标准值比较
+        Double qualifyResult = DataUtils.getQualifyResult(standardValue, statisticItem.getQualifyFormula(),
+                DataUtils.doubleDivide(currentMonth, 100d));
 
         QualifiedEnum qualifiedEnum = QualifiedEnum.getByType(qualifyResult);
         if (qualifiedEnum == null) {

+ 1 - 1
src/main/java/com/persagy/apm/report/indicator/factory/IotFactory.java

@@ -99,7 +99,7 @@ public class IotFactory {
 
         for (Date tmpDate : firstDayOfEveryMonth) {
             Double currentMonthValue = null;
-            if (tmpDate.before(date)) {
+            if (!tmpDate.after(date)) {
                 currentMonthValue = getCurrentMonthValue(iotDefine, projectId, tmpDate);
             }
             GraphItemVO graphItemVO = new GraphItemVO(

+ 1 - 2
src/main/java/com/persagy/apm/report/paragraphs/service/impl/env/AreaEnvBuilder.java

@@ -209,10 +209,9 @@ public class AreaEnvBuilder extends AreaIndicatorsParagraphBuilder {
         Map<String, Integer> sortMap = new HashMap<>();
         sortMap.put("value", -1);
         DataUtils.sort(projectsComplianceRate, sortMap);
-
         Gson gson = new Gson();
         GraphVO graphVO = new GraphVO(StandardNames.STANDARD_VALUE,
-                qualifiedStandard.getValue(), AttrValueTypeEnum.percent, projectsComplianceRate);
+                qualifiedStandard.getValue(), AttrValueTypeEnum.percent_2, projectsComplianceRate);
         AttrValueVO projectComplianceRates = new AttrValueVO(
                 AreaEnvContentCodes.projectComplianceRates.name(),
                 gson.toJson(graphVO), AttrValueTypeEnum.graph);