潘钊 / control_service_data_Interface · Commits

Commit 73f9bcc9d80c2dc81c8fd0099ce51f85d94706d3

Authored by 娄高锋
1 parent 70a40782
build: skipped

氢能源

Inline Side-by-side
Showing 1 changed file with 10 additions and 16 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
  View file @73f9bcc
... ... @@ -179,25 +179,19 @@ public class WSDataConver {
179 179 Field jGhField = ScheduleRealInfo.class.getDeclaredField("jGh");
180 180 //Field lpField = ScheduleRealInfo.class.getDeclaredField("lpName");
181 181  
182   - List<ScheduleRealInfo> list;
183   - ArrayListMultimap<String, ScheduleRealInfo> jGhListMap;
184   - ScheduleRealInfo sch;
185   - NH_waybill nh_waybill, total = new NH_waybill();
  182 + NH_waybill total = new NH_waybill();
186 183 NH_waybillItem nh_waybillItem, totalItem = new NH_waybillItem();
187   - List<OilInfo> oilInfo;
188   - List<ElecInfo> elecInfo;
189   - List<HInfo> hInfo;
190 184 boolean isFirst = true;
191 185  
192 186 double jhlc = 0, sjjhlc = 0, cclc = 0, jclc = 0, yylc = 0, kslc = 0, cjlc = 0, lblc = 0, zjlc = 0, zlc = 0;
193 187 double yhTotal = 0;
194 188 for (int i = 0; i < nbbmArray.size(); i++) {
195   - list = listMap.get(nbbmArray.get(i));
196   - if (list.size() == 0)
  189 + List<ScheduleRealInfo> listSch = listMap.get(nbbmArray.get(i));
  190 + if (listSch.size() == 0)
197 191 continue;
198 192 //班次信息
199   - nh_waybill = new NH_waybill();
200   - sch = list.get(0);
  193 + NH_waybill nh_waybill = new NH_waybill();
  194 + ScheduleRealInfo sch = listSch.get(0);
201 195 //日期
202 196 nh_waybill.setM_strYYRQ(sch.getScheduleDateStr());
203 197 //车辆自编号
... ... @@ -215,9 +209,9 @@ public class WSDataConver {
215 209 }
216 210  
217 211 //按 驾驶员 分组班次，构造路单子项
218   - jGhListMap = new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, "_", jGhField);
  212 + ArrayListMultimap<String, ScheduleRealInfo> jGhListMap = new ConvertUtil<ScheduleRealInfo>().groupMultiList(listSch, "_", jGhField);
219 213 for (String jGh : jGhListMap.keySet()) {
220   - list = jGhListMap.get(jGh);
  214 + List<ScheduleRealInfo> list = jGhListMap.get(jGh);
221 215 nh_waybillItem = new NH_waybillItem();
222 216 //计划里程
223 217 nh_waybillItem.setM_dblJHLC(ScheduleCalculator.calcJHLC(list));
... ... @@ -288,7 +282,7 @@ public class WSDataConver {
288 282 //备注
289 283 nh_waybillItem.setM_strBZ("");
290 284  
291   - oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
  285 + List<OilInfo> oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
292 286 if (oilInfo != null && oilInfo.size() > 0) {
293 287 Double czyl = 0., jzyl = 0., jzl = 0., ns = 0., yh = 0.;
294 288 String rylx = "";
... ... @@ -329,7 +323,7 @@ public class WSDataConver {
329 323 nh_waybillItem.setM_strYHLX1("");
330 324 }
331 325  
332   - elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
  326 + List<ElecInfo> elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
333 327 if (elecInfo != null && elecInfo.size() > 0) {
334 328 Double cdl = 0., hd = 0.;
335 329 for (ElecInfo ei : elecInfo) {
... ... @@ -363,7 +357,7 @@ public class WSDataConver {
363 357 nh_waybillItem.setM_strYHLX1("");
364 358 }
365 359  
366   - hInfo = hInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
  360 + List<HInfo> hInfo = hInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
367 361 if (hInfo != null && hInfo.size() > 0) {
368 362 Double cql = 0., hq = 0.;
369 363 for (HInfo h : hInfo) {
... ...