浏览代码

修复根据状态查询报告的bug

lixing 3 年之前
父节点
当前提交
5cd29a18bc

+ 1 - 0
src/main/java/com/persagy/apm/energy/report/common/service/impl/CommonServiceImpl.java

@@ -74,6 +74,7 @@ public class CommonServiceImpl implements CommonService {
             Double standardValue = DataUtils.parseDouble(standardValueStr);
             platform.setStandardValue(standardValue);
             platform.setQualifyFormula(statisticItems.getQualifyFormula());
+            platform.setStandardFlag(statisticItems.getStandardFlag());
             PlatformAreaInfoVO platformAreaInfoVO = platformService.getAreaPlatformRate(statisticItems, queryPlatformParamDTO);
             if (null != platformAreaInfoVO) {
                 platform.setSatisfiedCount(platformAreaInfoVO.getSatisfiedCount());

+ 3 - 0
src/main/java/com/persagy/apm/energy/report/monthly/config/statisticsitems/model/StatisticItems.java

@@ -36,6 +36,9 @@ public class StatisticItems extends AuditableEntity<StatisticItems> implements S
     @ApiModelProperty("合格的判断公式")
     private String qualifyFormula;
 
+    @ApiModelProperty("合格的判断公式")
+    private String standardFlag;
+
 
     public static String PROP_ITEM_CODE = "item_code";
     public static String PROP_ITEM_SOURCE = "item_source";

+ 3 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Platform.java

@@ -29,6 +29,9 @@ public class Platform {
     @ApiModelProperty("校验规则")
     private String qualifyFormula;
 
+    @ApiModelProperty("合格标准(展示用)")
+    private String standardFlag;
+
     @ApiModelProperty("达标数量")
     private Integer satisfiedCount;
 

+ 1 - 1
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

@@ -330,7 +330,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
             queryWrapper.lt(ReportOutline.PROP_REPORT_MONTH, pageQueryReportOutlineDTO.getEndDate());
         }
 
-        if (pageQueryReportOutlineDTO.getStatus() != null) {
+        if (StringUtils.isNotBlank(pageQueryReportOutlineDTO.getStatus())) {
             queryWrapper.eq(ReportOutline.PROP_STATUS, pageQueryReportOutlineDTO.getStatus());
         }
 

+ 1 - 0
src/main/resources/mapper/StatisticItemsMapper.xml

@@ -8,6 +8,7 @@
         <result column="item_source" property="itemSource"/>
         <result column="standard_value" property="standardValue"/>
         <result column="qualify_formula" property="qualifyFormula"/>
+        <result column="standard_flag" property="standardFlag"/>
         <result column="ts" property="ts"/>
         <result column="creator" property="creator"/>
         <result column="creation_time" property="creationTime"/>