|
@@ -72,6 +72,8 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
|
72
|
String startDate = aoidYeildVo.getStartDate() + " 00:00:00";
|
72
|
String startDate = aoidYeildVo.getStartDate() + " 00:00:00";
|
73
|
String endDate = aoidYeildVo.getEndDate() + " 00:00:00";
|
73
|
String endDate = aoidYeildVo.getEndDate() + " 00:00:00";
|
74
|
List<String> wellids = new ArrayList<>();
|
74
|
List<String> wellids = new ArrayList<>();
|
|
|
75
|
+ List<String> objects = new ArrayList<>();
|
|
|
76
|
+ List<String> errorgts = new ArrayList<>();
|
75
|
if (aoidYeildVo.getWellId()!=null){
|
77
|
if (aoidYeildVo.getWellId()!=null){
|
76
|
wellids.add(aoidYeildVo.getWellId());
|
78
|
wellids.add(aoidYeildVo.getWellId());
|
77
|
}else {
|
79
|
}else {
|
|
@@ -122,6 +124,7 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
|
122
|
int errorgtsCount =0;
|
124
|
int errorgtsCount =0;
|
123
|
for (AoidDailyYield e : aoidDailyYields) {
|
125
|
for (AoidDailyYield e : aoidDailyYields) {
|
124
|
if (e.getLiqProdDaily()!=null){
|
126
|
if (e.getLiqProdDaily()!=null){
|
|
|
127
|
+ objects.add(e.getWellId());
|
125
|
liqProdDailyTotal+=e.getLiqProdDaily();
|
128
|
liqProdDailyTotal+=e.getLiqProdDaily();
|
126
|
}
|
129
|
}
|
127
|
if (e.getA2LiqProdDaily()!=null){
|
130
|
if (e.getA2LiqProdDaily()!=null){
|
|
@@ -130,10 +133,18 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
|
130
|
if (e.getYxgts()!=null){
|
133
|
if (e.getYxgts()!=null){
|
131
|
yxgtsCount+=e.getYxgts();
|
134
|
yxgtsCount+=e.getYxgts();
|
132
|
}
|
135
|
}
|
133
|
- if (e.getYxgts()!=null){
|
|
|
|
|
136
|
+ if (e.getErrorgts()!=null&& e.getErrorgts()>0){
|
|
|
137
|
+ errorgts.add(e.getWellId());
|
134
|
errorgtsCount+=e.getErrorgts();
|
138
|
errorgtsCount+=e.getErrorgts();
|
135
|
}
|
139
|
}
|
136
|
}
|
140
|
}
|
|
|
141
|
+ List<String> objectsList = new ArrayList(new HashSet(objects));
|
|
|
142
|
+ List<String> errorgtsList = new ArrayList(new HashSet(errorgts));
|
|
|
143
|
+ aoidYeildStatVo.setNotLipWellCount(0);
|
|
|
144
|
+ if (wellids.size()>objectsList.size()){
|
|
|
145
|
+ aoidYeildStatVo.setNotLipWellCount(wellids.size()-objectsList.size());
|
|
|
146
|
+ }
|
|
|
147
|
+ aoidYeildStatVo.setErrorgtsWellCount(errorgtsList.size());
|
137
|
//判断产液量比较日志产液量(0.一致1.下降2.上升)
|
148
|
//判断产液量比较日志产液量(0.一致1.下降2.上升)
|
138
|
if (liqProdDailyTotal<a2LiqProdDailyTotal){
|
149
|
if (liqProdDailyTotal<a2LiqProdDailyTotal){
|
139
|
aoidYeildStatVo.setLiqCompare(1);
|
150
|
aoidYeildStatVo.setLiqCompare(1);
|
|
@@ -328,7 +339,9 @@ public class AoidDailyYieldRefactorServiceImpl extends ServiceImpl<AoidDailyYiel
|
328
|
List<AoidYeildProportionBarVo> aoidYeildProportionBarVos = new ArrayList<>();
|
339
|
List<AoidYeildProportionBarVo> aoidYeildProportionBarVos = new ArrayList<>();
|
329
|
//通过orgId 获取子集OrgId 通过orgId获取数据
|
340
|
//通过orgId 获取子集OrgId 通过orgId获取数据
|
330
|
if (aoidYeildVo.getOrg()!=null){
|
341
|
if (aoidYeildVo.getOrg()!=null){
|
|
|
342
|
+ log.info("开始调用通过orgId 获取子集OrgId----------------------------------");
|
331
|
List<Map<String, String>> orgIds = getOrgIds(aoidYeildVo.getOrg());
|
343
|
List<Map<String, String>> orgIds = getOrgIds(aoidYeildVo.getOrg());
|
|
|
344
|
+ log.info("通过orgId 获取子集OrgId----------------------------------",JSONObject.toJSONString(orgIds));
|
332
|
/*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Ⅰ\"}]";
|
345
|
/*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Ⅰ\"}]";
|
333
|
//List<Map<String, String>> orgIds = JSONObject.parseObject(map, List.class);
|
346
|
//List<Map<String, String>> orgIds = JSONObject.parseObject(map, List.class);
|
334
|
List<Map<String, String>> orgIds =null;*/
|
347
|
List<Map<String, String>> orgIds =null;*/
|