值际对标功能修改

src/main/java/com/gyee/frame/service/contrast/ContrastZjService.java

@@ -40,6 +40,7 @@ public class ContrastZjService {
         String pattern = "yyyy-MM-dd";
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(zjs)) {
             Map<String, Windpowerstation> wpmap = InitialRunner.wpmap;
+            List<ConditionVo> ctvos = new ArrayList<ConditionVo>();
 
             if (zjs.indexOf(",") > 0) {
                 String[] strs = zjs.split(",");
@@ -109,10 +110,10 @@ public class ContrastZjService {
                     vo.setBeginDate(DateUtils.format(beginDate,"yyyy-MM-dd"));
                     vo.setEndDate(DateUtils.format(endDate,"yyyy-MM-dd"));
                     vo.setWpId(wpId);
-
+                    ctvos.add(vo);
 
                     setBenchMarkInfo(bm,wpId, beginDate, endDate);// 统计值际数据
-                    setBenchMark(bm, vo, str,request);
+                    setBenchMark(bm, ctvos, str,request);
                 }
             } else {
                 BenchMarkVo bm = new BenchMarkVo();
@@ -177,10 +178,10 @@ public class ContrastZjService {
                 vo.setBeginDate(DateUtils.format(beginDate,"yyyy-MM-dd"));
                 vo.setEndDate(DateUtils.format(endDate,"yyyy-MM-dd"));
                 vo.setWpId(wpId);
-
+                ctvos.add(vo);
 
                 setBenchMarkInfo(bm,wpId, beginDate, endDate);// 统计值际数据
-                setBenchMark(bm, vo, zjs,request);
+                setBenchMark(bm, ctvos, zjs,request);
             }
 
         }
@@ -188,7 +189,7 @@ public class ContrastZjService {
     }
 
 
-    private void setBenchMark(BenchMarkVo bm, ConditionVo ctvos, String str,HttpServletRequest request) {
+    private void setBenchMark(BenchMarkVo bm, List<ConditionVo> ctvos, String str,HttpServletRequest request) {
         totalBenchmarkInfo(bm);// 统计值际计算指标
 
         bm.setCid(StringUtils.getUUID());
@@ -218,13 +219,13 @@ public class ContrastZjService {
 
         request.getSession().setAttribute("bmvos", vos);
 
-        Map<String, ConditionVo> ctmap = null;
+        Map<String, List<ConditionVo>> ctmap = null;
         if (null != request.getSession().getAttribute("bmwtvos")) {
-            ctmap = (Map<String, ConditionVo>) request.getSession().getAttribute("bmwtvos");
+            ctmap = (Map<String, List<ConditionVo>>) request.getSession().getAttribute("bmwtvos");
 
             ctmap.put(bm.getCid(), ctvos);
         } else {
-            ctmap = new HashMap<String, ConditionVo>();
+            ctmap = new HashMap<String, List<ConditionVo>>();
 
             ctmap.put(bm.getCid(), ctvos);
         }