经济运行数据修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -111,7 +111,7 @@ public class SpecificService {
      */
     private void setDySpecificinfodays(String companys, String type, String yearmonth, SpecificTopVo dqvo) {
         QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.select("max(yllfdl) as yllfdl,max(yfdl) as yfdl,max(ygzssdl) as ygzssdl,max(ycnslgzssdl) as ycnslgzssdl,max(yjxssdl) as yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(ydjssdl) ydjssdl,max(yqxjclssdl) as yqxjclssdl,max(ysdtjssdl) as ysdtjssdl,max(yxnssdl) as yxnssdl,max(yxdtjssdl) as yxdtjssdl,max(yxdjclssdl) as yxdjclssdl,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl");
+        qw.select("sum(rllfdl) as yllfdl,sum(rfdl) as yfdl,sum(rgzssdl) as ygzssdl,sum(rcnslgzssdl) as ycnslgzssdl,sum(rjxssdl) as yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) as yqxjclssdl,sum(rsdtjssdl) as ysdtjssdl,sum(rxnssdl) as yxnssdl,sum(rxdtjssdl) as yxdtjssdl,sum(rxdjclssdl) as yxdjclssdl,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl");
         qw.eq("foreign_key_id", companys + type);
         qw.eq("to_char(record_date,'yyyy-MM')", yearmonth);
         qw.groupBy("to_char(record_date,'yyyy-MM')");
@@ -173,7 +173,7 @@ public class SpecificService {
         String year = String.valueOf(Integer.parseInt(yearString) - 1);
         String yearMonth = year + "-" + yearmonth.split("-")[1];
         QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.select("max(yllfdl) as yllfdl,max(yfdl) as yfdl,max(ygzssdl) as ygzssdl,max(ycnslgzssdl) as ycnslgzssdl,max(yjxssdl) as yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(ydjssdl) ydjssdl,max(yqxjclssdl) as yqxjclssdl,max(ysdtjssdl) as ysdtjssdl,max(yxnssdl) as yxnssdl,max(yxdtjssdl) as yxdtjssdl,max(yxdjclssdl) as yxdjclssdl,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl");
+        qw.select("sum(rllfdl) as yllfdl,sum(rfdl) as yfdl,sum(rgzssdl) as ygzssdl,sum(rcnslgzssdl) as ycnslgzssdl,sum(rjxssdl) as yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) as yqxjclssdl,sum(rsdtjssdl) as ysdtjssdl,sum(rxnssdl) as yxnssdl,sum(rxdtjssdl) as yxdtjssdl,sum(rxdjclssdl) as yxdjclssdl,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl");
         qw.eq("foreign_key_id", companys + type);
         qw.eq("to_char(record_date,'yyyy-MM')", yearMonth);
         qw.groupBy("to_char(record_date,'yyyy-MM')");
@@ -230,7 +230,7 @@ public class SpecificService {
      */
     private void setDnSpecificinfodays(String companys, String type, String yearmonth, SpecificTopVo dqvo) {
         QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.select("max(nllfdl) as nllfdl,max(nfdl) as nfdl,max(ngzssdl) as ngzssdl,max(ncnslgzssdl) as ncnslgzssdl,max(njxssdl) as njxssdl,max(ncnsljxssdl) ncnsljxssdl,max(ndjssdl) ndjssdl,max(nqxjclssdl) as nqxjclssdl,max(nsdtjssdl) as nsdtjssdl,max(nxnssdl) as nxnssdl,max(nxdtjssdl) as nxdtjssdl,max(nxdjclssdl) as nxdjclssdl,max(ncwsldwssdl) ncwsldwssdl,max(ncwsltqssdl) ncwsltqssdl");
+        qw.select("sum(rllfdl) as nllfdl,sum(rfdl) as nfdl,sum(rgzssdl) as ngzssdl,sum(rcnslgzssdl) as ncnslgzssdl,sum(rjxssdl) as njxssdl,sum(rcnsljxssdl) ncnsljxssdl,sum(rdjssdl) ndjssdl,sum(rqxjclssdl) as nqxjclssdl,sum(rsdtjssdl) as nsdtjssdl,sum(rxnssdl) as nxnssdl,sum(rxdtjssdl) as nxdtjssdl,sum(rxdjclssdl) as nxdjclssdl,sum(rcwsldwssdl) ncwsldwssdl,sum(rcwsltqssdl) ncwsltqssdl");
         qw.eq("foreign_key_id", companys + type);
         qw.eq("to_char(record_date,'yyyy')", yearmonth.split("-")[0]);
         qw.groupBy("to_char(record_date,'yyyy')");
@@ -290,7 +290,7 @@ public class SpecificService {
         String yearString = yearmonth.split("-")[0];
         String year = String.valueOf(Integer.parseInt(yearString) - 1);
         QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.select("max(nllfdl) as nllfdl,max(nfdl) as nfdl,max(ngzssdl) as ngzssdl,max(ncnslgzssdl) as ncnslgzssdl,max(njxssdl) as njxssdl,max(ncnsljxssdl) ncnsljxssdl,max(ndjssdl) ndjssdl,max(nqxjclssdl) as nqxjclssdl,max(nsdtjssdl) as nsdtjssdl,max(nxnssdl) as nxnssdl,max(nxdtjssdl) as nxdtjssdl,max(nxdjclssdl) as nxdjclssdl,max(ncwsldwssdl) ncwsldwssdl,max(ncwsltqssdl) ncwsltqssdl");
+        qw.select("sum(rllfdl) as nllfdl,sum(rfdl) as nfdl,sum(rgzssdl) as ngzssdl,sum(rcnslgzssdl) as ncnslgzssdl,sum(rjxssdl) as njxssdl,sum(rcnsljxssdl) ncnsljxssdl,sum(rdjssdl) ndjssdl,sum(rqxjclssdl) as nqxjclssdl,sum(rsdtjssdl) as nsdtjssdl,sum(rxnssdl) as nxnssdl,sum(rxdtjssdl) as nxdtjssdl,sum(rxdjclssdl) as nxdjclssdl,sum(rcwsldwssdl) ncwsldwssdl,sum(rcwsltqssdl) ncwsltqssdl");
         qw.eq("foreign_key_id", companys + type);
         qw.eq("to_char(record_date,'yyyy')", year);
         qw.groupBy("to_char(record_date,'yyyy')");
@@ -421,7 +421,7 @@ public class SpecificService {
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
 
-        qw.select("foreign_key_id,max(ymtbf) ymtbf,max(ymttr) ymttr,avg(rfwjsl) yfwjsl,avg(rztzhjsl) yztzhjsl,avg(rgzxqjsl) ygzxqjsl");
+        qw.select("foreign_key_id,sum(rmtbf) ymtbf,sum(rmttr) ymttr,avg(rfwjsl) yfwjsl,avg(rztzhjsl) yztzhjsl,avg(rgzxqjsl) ygzxqjsl");
         qw1.select("foreign_key_id,avg(rxtxlpr) yxtxlpr,avg(rlsl) ylsl,avg(rnbqzhxl) ynbqzhxl");
         qw.eq("location", "wp");
         qw1.eq("location", "wp");
@@ -507,7 +507,7 @@ public class SpecificService {
         String year = String.valueOf(Integer.parseInt(yearString) - 1);
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
-        qw.select("foreign_key_id,max(nmtbf) nmtbf,max(nmttr) nmttr,avg(rfwjsl) nfwjsl,avg(rztzhjsl) nztzhjsl,avg(rgzxqjsl) ngzxqjsl");
+        qw.select("foreign_key_id,sum(rmtbf) nmtbf,sum(rmttr) nmttr,avg(rfwjsl) nfwjsl,avg(rztzhjsl) nztzhjsl,avg(rgzxqjsl) ngzxqjsl");
         qw1.select("foreign_key_id,avg(rxtxlpr) nxtxlpr,avg(rlsl) nlsl,avg(rnbqzhxl) nnbqzhxl");
         qw.eq("location", "wp");
         qw1.eq("location", "wp");
@@ -585,7 +585,7 @@ public class SpecificService {
         List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
-        qw.select("foreign_key_id,max(ymtbf) ymtbf,max(ymttr) ymttr,avg(rfwjsl) yfwjsl,avg(rztzhjsl) yztzhjsl,avg(rgzxqjsl) ygzxqjsl");
+        qw.select("foreign_key_id,sum(rmtbf) ymtbf,sum(rmttr) ymttr,avg(rfwjsl) yfwjsl,avg(rztzhjsl) yztzhjsl,avg(rgzxqjsl) ygzxqjsl");
         qw1.select("foreign_key_id,avg(rxtxlpr) yxtxlpr,avg(rlsl) ylsl,avg(rnbqzhxl) ynbqzhxl");
         qw.eq("location", "wp");
         qw1.eq("location", "wp");
@@ -662,7 +662,7 @@ public class SpecificService {
 
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
-        qw.select("foreign_key_id,max(nmtbf) nmtbf,max(nmttr) nmttr,avg(rfwjsl) nfwjsl,avg(rztzhjsl) nztzhjsl,avg(rgzxqjsl) ngzxqjsl");
+        qw.select("foreign_key_id,sum(rmtbf) nmtbf,sum(rmttr) nmttr,avg(rfwjsl) nfwjsl,avg(rztzhjsl) nztzhjsl,avg(rgzxqjsl) ngzxqjsl");
         qw1.select("foreign_key_id,avg(rxtxlpr) nxtxlpr,avg(rlsl) nlsl,avg(rnbqzhxl) nnbqzhxl");
         qw.eq("location", "wp");
         qw1.eq("location", "wp");
@@ -736,7 +736,7 @@ public class SpecificService {
 
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -752,7 +752,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -760,7 +760,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -776,7 +776,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -884,7 +884,7 @@ public class SpecificService {
     public List<SpecificTarget> fdlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -900,7 +900,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -908,7 +908,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -924,7 +924,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yfdl) yfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1030,7 +1030,7 @@ public class SpecificService {
     public List<SpecificTarget> zhcydlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay5> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yzhcydldb) yzhcydldb");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rzhcydldb) yzhcydldb");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1046,7 +1046,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay5> currentList = proEconPowerstationInfoDay5Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yzhcydldb) yzhcydldb");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rzhcydldb) yzhcydldb");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1054,7 +1054,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay5> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yzhcydldb) yzhcydldb");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rzhcydldb) yzhcydldb");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1070,7 +1070,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay5> sameperiodList = proEconPowerstationInfoDay5Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yzhcydldb) yzhcydldb");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rzhcydldb) yzhcydldb");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1177,7 +1177,7 @@ public class SpecificService {
     public List<SpecificTarget> gzsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ygzssdl) ygzssdl,max(ycnslgzssdl) ycnslgzssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rgzssdl) ygzssdl,sum(rcnslgzssdl) ycnslgzssdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1193,7 +1193,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ygzssdl) ygzssdl,max(ycnslgzssdl) ycnslgzssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rgzssdl) ygzssdl,sum(rcnslgzssdl) ycnslgzssdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1201,7 +1201,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ygzssdl) ygzssdl,max(ycnslgzssdl) ycnslgzssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rgzssdl) ygzssdl,sum(rcnslgzssdl) ycnslgzssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1217,7 +1217,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ygzssdl) ygzssdl,max(ycnslgzssdl) ycnslgzssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rgzssdl) ygzssdl,sum(rcnslgzssdl) ycnslgzssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1323,7 +1323,7 @@ public class SpecificService {
     public List<SpecificTarget> whsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yjxssdl) yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rjxssdl) yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1339,7 +1339,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yjxssdl) yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rjxssdl) yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1347,7 +1347,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yjxssdl) yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rjxssdl) yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1363,7 +1363,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yjxssdl) yjxssdl,max(ycnsljxssdl) ycnsljxssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rjxssdl) yjxssdl,sum(rcnsljxssdl) ycnsljxssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1469,7 +1469,7 @@ public class SpecificService {
     public List<SpecificTarget> xdsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yxdtjssdl) yxdtjssdl,max(yxdjclssdl) yxdjclssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rxdtjssdl) yxdtjssdl,sum(rxdjclssdl) yxdjclssdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1485,7 +1485,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(yxdtjssdl) yxdtjssdl,max(yxdjclssdl) yxdjclssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rxdtjssdl) yxdtjssdl,sum(rxdjclssdl) yxdjclssdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1493,7 +1493,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yxdtjssdl) yxdtjssdl,max(yxdjclssdl) yxdjclssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rxdtjssdl) yxdtjssdl,sum(rxdjclssdl) yxdjclssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1509,7 +1509,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(yxdtjssdl) yxdtjssdl,max(yxdjclssdl) yxdjclssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rxdtjssdl) yxdtjssdl,sum(rxdjclssdl) yxdjclssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1615,7 +1615,7 @@ public class SpecificService {
     public List<SpecificTarget> xnsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ydjssdl) ydjssdl,max(yqxjclssdl) yqxjclssdl,max(ysdtjssdl) ysdtjssdl,max(yxnssdl) yxnssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) yqxjclssdl,sum(rsdtjssdl) ysdtjssdl,sum(rxnssdl) yxnssdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1631,7 +1631,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ydjssdl) ydjssdl,max(yqxjclssdl) yqxjclssdl,max(ysdtjssdl) ysdtjssdl,max(yxnssdl) yxnssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) yqxjclssdl,sum(rsdtjssdl) ysdtjssdl,sum(rxnssdl) yxnssdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1639,7 +1639,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ydjssdl) ydjssdl,max(yqxjclssdl) yqxjclssdl,max(ysdtjssdl) ysdtjssdl,max(yxnssdl) yxnssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) yqxjclssdl,sum(rsdtjssdl) ysdtjssdl,sum(rxnssdl) yxnssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1655,7 +1655,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ydjssdl) ydjssdl,max(yqxjclssdl) yqxjclssdl,max(ysdtjssdl) ysdtjssdl,max(yxnssdl) yxnssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rdjssdl) ydjssdl,sum(rqxjclssdl) yqxjclssdl,sum(rsdtjssdl) ysdtjssdl,sum(rxnssdl) yxnssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1761,7 +1761,7 @@ public class SpecificService {
     public List<SpecificTarget> slsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl,sum(rllfdl) yllfdl");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -1777,7 +1777,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl,max(yllfdl) yllfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl,sum(rllfdl) yllfdl");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -1785,7 +1785,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -1801,7 +1801,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ycwsldwssdl) ycwsldwssdl,max(ycwsltqssdl) ycwsltqssdl,max(yllfdl) yllfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rcwsldwssdl) ycwsldwssdl,sum(rcwsltqssdl) ycwsltqssdl,sum(rllfdl) yllfdl");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -2346,7 +2346,7 @@ public class SpecificService {
 
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay4> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ymtbf) ymtbf");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rmtbf) ymtbf");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -2362,7 +2362,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay4> currentList = proEconPowerstationInfoDay4Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ymtbf) ymtbf");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rmtbf) ymtbf");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -2370,7 +2370,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay4> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ymtbf) ymtbf");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rmtbf) ymtbf");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -2386,7 +2386,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay4> sameperiodList = proEconPowerstationInfoDay4Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ymtbf) ymtbf");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rmtbf) ymtbf");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -2492,7 +2492,7 @@ public class SpecificService {
     public List<SpecificTarget> mttrList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay4> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ymttr) ymttr");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rmttr) ymttr");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -2508,7 +2508,7 @@ public class SpecificService {
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay4> currentList = proEconPowerstationInfoDay4Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,max(ymttr) ymttr");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rmttr) ymttr");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -2516,7 +2516,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<ProEconPowerstationInfoDay4> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ymttr) ymttr");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rmttr) ymttr");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -2532,7 +2532,7 @@ public class SpecificService {
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
         List<ProEconPowerstationInfoDay4> sameperiodList = proEconPowerstationInfoDay4Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,max(ymttr) ymttr");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rmttr) ymttr");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");