|
@@ -322,7 +322,7 @@ public class BenchmarkingService {
|
|
|
|
|
|
}
|
|
}
|
|
qw.select(String.valueOf(sb));
|
|
qw.select(String.valueOf(sb));
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
if (StringUtils.isNotEmpty(companyid) && companyid.endsWith("ZGS")) {
|
|
if (StringUtils.isNotEmpty(companyid) && companyid.endsWith("ZGS")) {
|
|
qw.eq("company_id", companyid);
|
|
qw.eq("company_id", companyid);
|
|
}
|
|
}
|
|
@@ -847,7 +847,7 @@ public class BenchmarkingService {
|
|
}
|
|
}
|
|
sb.append("sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
sb.append("sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
qw.select(String.valueOf(sb));
|
|
qw.select(String.valueOf(sb));
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
//
|
|
//
|
|
// if (companys.endsWith("RGN")) {
|
|
// if (companys.endsWith("RGN")) {
|
|
// qw.eq("region_id", companys);
|
|
// qw.eq("region_id", companys);
|
|
@@ -1049,7 +1049,7 @@ public class BenchmarkingService {
|
|
|
|
|
|
List<WxsslVo> resultList = new ArrayList<>();
|
|
List<WxsslVo> resultList = new ArrayList<>();
|
|
qw.select("record_date,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
qw.select("record_date,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
if (StringUtils.isNotEmpty(wpid)) {
|
|
if (StringUtils.isNotEmpty(wpid)) {
|
|
qw.eq("station_id", wpid);
|
|
qw.eq("station_id", wpid);
|
|
}
|
|
}
|
|
@@ -1179,7 +1179,7 @@ public class BenchmarkingService {
|
|
Integer total = 0;
|
|
Integer total = 0;
|
|
qw.select("station_id,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
qw.select("station_id,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
|
|
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|
|
qw.in("station_id", wpList);
|
|
qw.in("station_id", wpList);
|
|
@@ -1257,7 +1257,7 @@ public class BenchmarkingService {
|
|
QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
|
|
QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
|
|
Integer total = 0;
|
|
Integer total = 0;
|
|
qw.select("project_id,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
qw.select("project_id,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|
|
qw.in("station_id", wpList);
|
|
qw.in("station_id", wpList);
|
|
@@ -1347,7 +1347,7 @@ public class BenchmarkingService {
|
|
Integer total = 0;
|
|
Integer total = 0;
|
|
qw.select("line_id,sum(rfdl) rfdl,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
qw.select("line_id,sum(rfdl) rfdl,sum(rfdl) rfdl,sum(llfdl) llfdl,avg(pjfs) pjfs,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(slss) slss,sum(gzss) gzss,sum(xdss) xdss,sum(xnss) xnss,sum(djss) djss");
|
|
|
|
|
|
- qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
+ qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
|
|
|
|
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
if (StringUtils.isNotEmpty(wpids)) {
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|
|
List<String> wpList = Arrays.asList(wpids.split(","));
|