repair-放开注解

src/main/java/com/gct/aoid/entity/Vo/AoidYeildStatVo.java

@@ -43,4 +43,9 @@ public class AoidYeildStatVo {
     private Integer errorgtsCount;
     @ApiModelProperty(value = "量液异常数量")
     private Integer liqProdDailyAbnormalCount;
+    @ApiModelProperty(value = "错误工图井数")
+    private Integer errorgtsWellCount;
+    @ApiModelProperty(value = "无产量井数")
+    private Integer notLipWellCount;
+
 }

src/main/java/com/gct/aoid/service/impl/AoidDailyYieldRefactorServiceImpl.java

@@ -72,6 +72,8 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
         String startDate = aoidYeildVo.getStartDate() + " 00:00:00";
         String endDate = aoidYeildVo.getEndDate() + " 00:00:00";
         List<String> wellids = new ArrayList<>();
+        List<String> objects = new ArrayList<>();
+        List<String> errorgts = new ArrayList<>();
         if (aoidYeildVo.getWellId()!=null){
             wellids.add(aoidYeildVo.getWellId());
         }else {
@@ -122,6 +124,7 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
         int errorgtsCount =0;
         for (AoidDailyYield e : aoidDailyYields) {
             if (e.getLiqProdDaily()!=null){
+                objects.add(e.getWellId());
                 liqProdDailyTotal+=e.getLiqProdDaily();
             }
             if (e.getA2LiqProdDaily()!=null){
@@ -130,10 +133,18 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
             if (e.getYxgts()!=null){
                 yxgtsCount+=e.getYxgts();
             }
-            if (e.getYxgts()!=null){
+            if (e.getErrorgts()!=null&& e.getErrorgts()>0){
+                errorgts.add(e.getWellId());
                 errorgtsCount+=e.getErrorgts();
             }
         }
+        List<String> objectsList = new ArrayList(new HashSet(objects));
+        List<String> errorgtsList = new ArrayList(new HashSet(errorgts));
+        aoidYeildStatVo.setNotLipWellCount(0);
+         if (wellids.size()>objectsList.size()){
+            aoidYeildStatVo.setNotLipWellCount(wellids.size()-objectsList.size());
+        }
+        aoidYeildStatVo.setErrorgtsWellCount(errorgtsList.size());
         //判断产液量比较日志产液量(0.一致1.下降2.上升)
         if (liqProdDailyTotal<a2LiqProdDailyTotal){
             aoidYeildStatVo.setLiqCompare(1);
@@ -328,7 +339,9 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
         List<AoidYeildProportionBarVo> aoidYeildProportionBarVos = new ArrayList<>();
         //通过orgId 获取子集OrgId 通过orgId获取数据
         if (aoidYeildVo.getOrg()!=null){
+            log.info("开始调用通过orgId 获取子集OrgId----------------------------------");
             List<Map<String, String>> orgIds = getOrgIds(aoidYeildVo.getOrg());
+            log.info("通过orgId 获取子集OrgId----------------------------------",JSONObject.toJSONString(orgIds));
             /*String map = "[{\"org_id\":\"6\",\"org_level\":3,\"org_name\":\"哈得逊零采\"},{\"org_id\":\"5\",\"org_level\":3,\"org_name\":\"哈得4  CⅢ\"},{\"org_id\":\"4\",\"org_level\":3,\"org_name\":\"哈得10  CⅠ\"},{\"org_id\":\"3\",\"org_level\":3,\"org_name\":\"哈得1  CⅠ\"}]";
             //List<Map<String, String>> orgIds = JSONObject.parseObject(map, List.class);
             List<Map<String, String>> orgIds =null;*/