去掉国能宁夏数据

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbineGoodnessDetailController.java

@@ -97,7 +97,7 @@ public class WindturbineGoodnessDetailController {
                 wtday.setRyfdl(NumberUtil.round(tb.getLlfdl() / 1000, 2).doubleValue());
                 wtday.setRpjfs(NumberUtil.round(tb.getPjfs(), 2).doubleValue());
                 wtday.setRyxxs(NumberUtil.round((tb.getYxMin() + tb.getXdMin()) / 60, 2).doubleValue());
-                wtday.setRjxxs(NumberUtil.round(tb.getTjMin() / 60, 2).doubleValue());
+                wtday.setRjxxs(NumberUtil.round(tb.getJxMin() / 60, 2).doubleValue());
                 wtday.setRgzxs(NumberUtil.round(tb.getGzMin() / 60, 2).doubleValue());
                 wtday.setRdjxs(NumberUtil.round(tb.getDjMin() / 60, 2).doubleValue());
                 wtday.setRzdxs(NumberUtil.round(tb.getLxMin() / 60, 2).doubleValue());

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -4,6 +4,7 @@ package com.gyee.runeconomy.service.bmk;
 @date   2022/11/23-11:06
 */
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.BigDecimalUtils;
@@ -1348,7 +1349,7 @@ public class BenchmarkingService {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
         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) as rfdl,sum(llfdl) as llfdl,avg(pjfs) as pjfs,sum(jhjxss) as jhjxss,sum(fjhjxss) as fjhjxss,sum(slss) as slss,sum(gzss) as gzss,sum(xdss) as xdss,sum(xnss) as xnss,sum(djss) as djss");
 
         qw.ge("record_date", DateUtils.parseDate(beginDate)).lt("record_date", DateUtils.parseDate(endDate));
 
@@ -1558,7 +1559,8 @@ public class BenchmarkingService {
             }
             vo.setFdl(DoubleUtils.keepPrecision(i.getRfdl() / 1000, 2));
             vo.setLlfdl(DoubleUtils.keepPrecision(i.getLlfdl() / 1000, 2));
-            vo.setJxssdl(DoubleUtils.keepPrecision((i.getJhjxss() + i.getFjhjxss()) / 1000, 2));
+//            vo.setJxssdl(DoubleUtils.keepPrecision((i.getJhjxss() + i.getFjhjxss()) / 1000, 2));
+            vo.setJxssdl(DoubleUtils.keepPrecision((i.getJhjxss()) / 1000, 2));
             vo.setGzssdl(DoubleUtils.keepPrecision(i.getGzss() / 1000, 2));
             vo.setXdssdl(DoubleUtils.keepPrecision((i.getXdss() + i.getDjss()) / 1000, 2));
             vo.setSlssdl(DoubleUtils.keepPrecision(i.getSlss() / 1000, 2));

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

@@ -1440,7 +1440,7 @@ public class SpecificService {
     public List<SpecificTarget> fnlylList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,avg(fnlyl) fnlyl");
+        currentqw.select("station_id,max(record_date) as record_date,avg(fnlyl) as fnlyl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
             currentqw.like("station_id", "_FDC_");
@@ -1451,7 +1451,7 @@ public class SpecificService {
         List<TurbineInfoDay> currentList = iTurbineInfoDayService.list(currentqw);
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl) rfdl,sum(llfdl) llfdl");
+        sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl) as rfdl,sum(llfdl) as llfdl");
         if (type.equals("-1")) {
             currentqw.like("station_id", "_FDC_");
         } else {
@@ -1535,12 +1535,6 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
 
             });
         }
@@ -1856,7 +1850,7 @@ public class SpecificService {
 
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) as record_date,sum(rfdl_fj) rfdl_fj");
+        currentqw.select("station_id,max(record_date) as record_date,sum(rfdl_fj) as rfdl_fj");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         if (Integer.parseInt(year) == now.getYear()) {
@@ -1867,7 +1861,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(rfdl_fj) as rfdl_fj");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         currentqw.lt("record_date", of);
@@ -1947,12 +1941,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2112,7 +2100,7 @@ public class SpecificService {
     public List<SpecificTarget> zhcydlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(zhcydl) zhcydl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(zhcydl) as zhcydl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2121,7 +2109,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(zhcydl) zhcydl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(zhcydl) as zhcydl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2201,12 +2189,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2367,7 +2349,7 @@ public class SpecificService {
     public List<SpecificTarget> gwdlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(gwdl) gwdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(gwdl) as gwdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2376,7 +2358,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(gwdl) gwdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(gwdl) as gwdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2453,16 +2435,9 @@ public class SpecificService {
                     }
                 }
 
-
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2623,7 +2598,7 @@ public class SpecificService {
     public List<SpecificTarget> swdlList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(swdl) swdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(swdl) as swdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2632,7 +2607,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<StationInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(swdl) swdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(swdl) as swdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2712,12 +2687,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -2896,7 +2865,7 @@ public class SpecificService {
     public List<SpecificTarget> lyxsList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(lyxs) lyxs");
+        currentqw.select("station_id,max(record_date) as record_date,sum(lyxs) as lyxs");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2904,7 +2873,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year);
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(lyxs) lyxs");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(lyxs) as lyxs");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear - 1));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -2980,12 +2949,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -3317,7 +3280,7 @@ public class SpecificService {
     public List<SpecificTarget> gzsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(gzss) gzss,sum(llfdl) llfdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(gzss) as gzss,sum(llfdl) as llfdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -3326,7 +3289,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(gzss) gzss,sum(llfdl) llfdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(gzss) as gzss,sum(llfdl) as llfdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -3422,14 +3385,6 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
-
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
-
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -3587,7 +3542,7 @@ public class SpecificService {
     public List<SpecificTarget> whsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(jhjxss) jhjxss,sum(fjhjxss) fjhjxss,sum(llfdl) llfdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(jhjxss) as jhjxss,sum(fjhjxss) as fjhjxss,sum(llfdl) as llfdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -3687,12 +3642,6 @@ public class SpecificService {
 
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -3851,7 +3800,7 @@ public class SpecificService {
     public List<SpecificTarget> xdsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(xdss) xdss,sum(llfdl) llfdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(xdss) as xdss,sum(llfdl) as llfdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -3859,7 +3808,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(xdss) xdss,sum(llfdl) llfdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(xdss) as xdss,sum(llfdl) as llfdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -3949,17 +3898,9 @@ public class SpecificService {
                     }
                 }
 
-
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
-
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -4116,7 +4057,7 @@ public class SpecificService {
     public List<SpecificTarget> xnsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(xnss) xnss,sum(llfdl) llfdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(xnss) as xnss,sum(llfdl) as llfdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -4125,7 +4066,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(xnss) xnss,sum(llfdl) llfdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(xnss) as xnss,sum(llfdl) as llfdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -4219,13 +4160,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
-
             });
         }
 
@@ -4383,7 +4317,7 @@ public class SpecificService {
     public List<SpecificTarget> slsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(slss) slss,sum(llfdl) llfdl");
+        currentqw.select("station_id,max(record_date) as record_date,sum(slss) as slss,sum(llfdl) as llfdl");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -4392,7 +4326,7 @@ public class SpecificService {
 
         int subYear = Integer.parseInt(year) - 1;
         QueryWrapper<TurbineInfoDay> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("station_id,max(record_date) record_date,sum(slss) slss,sum(llfdl) llfdl");
+        sameperiodqw.select("station_id,max(record_date) as record_date,sum(slss) as slss,sum(llfdl) as llfdl");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
@@ -4487,13 +4421,6 @@ public class SpecificService {
                 vo.setTargetList(tempList);
                 resultendList.add(vo);
 
-                SpecificTarget vo2 = new SpecificTarget();
-                vo2.setWpid(vo.getWpid());
-                vo2.setTargetList(vo.getTargetList());
-                vo2.setOrderNum(vo.getOrderNum() + 1);
-                vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-                resultendList.add(vo2);
-
             });
         }
         SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
@@ -5316,12 +5243,6 @@ public class SpecificService {
 
             vo.setTargetList(tempList);
             resultendList.add(vo);
-            SpecificTarget vo2 = new SpecificTarget();
-            vo2.setWpid(vo.getWpid());
-            vo2.setTargetList(vo.getTargetList());
-            vo2.setOrderNum(vo.getOrderNum() + 1);
-            vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-            resultendList.add(vo2);
 
         });
 
@@ -5412,12 +5333,6 @@ public class SpecificService {
 
             vo.setTargetList(tempList);
             resultendList.add(vo);
-            SpecificTarget vo2 = new SpecificTarget();
-            vo2.setWpid(vo.getWpid());
-            vo2.setTargetList(vo.getTargetList());
-            vo2.setOrderNum(vo.getOrderNum() + 1);
-            vo2.setWpname(CacheContext.cpmap.get(companys).getAname());
-            resultendList.add(vo2);
 
         });