氢能源

娄高锋
1 parent 70a40782
Showing 1 changed file with 10 additions and 16 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -179,25 +179,19 @@ public class WSDataConver {
         Field jGhField = ScheduleRealInfo.class.getDeclaredField("jGh");
         //Field lpField = ScheduleRealInfo.class.getDeclaredField("lpName");
-        List<ScheduleRealInfo> list;
-        ArrayListMultimap<String, ScheduleRealInfo> jGhListMap;
-        ScheduleRealInfo sch;
-        NH_waybill nh_waybill, total = new NH_waybill();
+        NH_waybill total = new NH_waybill();
         NH_waybillItem nh_waybillItem, totalItem = new NH_waybillItem();
-        List<OilInfo> oilInfo;
-        List<ElecInfo> elecInfo;
-        List<HInfo> hInfo;
         boolean isFirst = true;
         double jhlc = 0, sjjhlc = 0, cclc = 0, jclc = 0, yylc = 0, kslc = 0, cjlc = 0, lblc = 0, zjlc = 0, zlc = 0;
         double yhTotal = 0;
         for (int i = 0; i < nbbmArray.size(); i++) {
-            list = listMap.get(nbbmArray.get(i));
-            if (list.size() == 0)
+        	List<ScheduleRealInfo> listSch = listMap.get(nbbmArray.get(i));
+            if (listSch.size() == 0)
                 continue;
             //班次信息
-            nh_waybill = new NH_waybill();
-            sch = list.get(0);
+            NH_waybill nh_waybill = new NH_waybill();
+            ScheduleRealInfo sch = listSch.get(0);
             //日期
             nh_waybill.setM_strYYRQ(sch.getScheduleDateStr());
             //车辆自编号
@@ -215,9 +209,9 @@ public class WSDataConver {
             }
             //按 驾驶员 分组班次，构造路单子项
-            jGhListMap = new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, "_", jGhField);
+            ArrayListMultimap<String, ScheduleRealInfo> jGhListMap = new ConvertUtil<ScheduleRealInfo>().groupMultiList(listSch, "_", jGhField);
             for (String jGh : jGhListMap.keySet()) {
-                list = jGhListMap.get(jGh);
+            	List<ScheduleRealInfo> list = jGhListMap.get(jGh);
                 nh_waybillItem = new NH_waybillItem();
                 //计划里程
                 nh_waybillItem.setM_dblJHLC(ScheduleCalculator.calcJHLC(list));
@@ -288,7 +282,7 @@ public class WSDataConver {
                 //备注
                 nh_waybillItem.setM_strBZ("");
-                oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
+                List<OilInfo> oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
                 if (oilInfo != null && oilInfo.size() > 0) {
                     Double czyl = 0., jzyl = 0., jzl = 0., ns = 0., yh = 0.;
                     String rylx = "";
@@ -329,7 +323,7 @@ public class WSDataConver {
                     nh_waybillItem.setM_strYHLX1("");
                 }
-                elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
+                List<ElecInfo> elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
                 if (elecInfo != null && elecInfo.size() > 0) {
                     Double cdl = 0., hd = 0.;
                     for (ElecInfo ei : elecInfo) {
@@ -363,7 +357,7 @@ public class WSDataConver {
                     nh_waybillItem.setM_strYHLX1("");
                 }
-                hInfo = hInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
+                List<HInfo> hInfo = hInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
                 if (hInfo != null && hInfo.size() > 0) {
                     Double cql = 0., hq = 0.;
                     for (HInfo h : hInfo) {