潘钊 / control_service_data_Interface · Commits

Commit b58f098ced8b2c79ba6f8b148ef6f1d4a484bb05

Authored by 王通
1 parent 2573197a
build: skipped

1.浦东分支逻辑问题修复

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
  View file @b58f098
... ... @@ -449,7 +449,7 @@ public class WSDataConver {
449 449 nh_waybillItem.setM_strBZ("");
450 450  
451 451 oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
452   - if (oilInfo != null) {
  452 + if (oilInfo != null && oilInfo.size() > 0) {
453 453 Double czyl = 0., jzyl = 0., jzl = 0., ns = 0., yh = 0.;
454 454 String rylx = "";
455 455 for (OilInfo oi : oilInfo) {
... ... @@ -487,7 +487,7 @@ public class WSDataConver {
487 487 }
488 488  
489 489 elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
490   - if (elecInfo != null) {
  490 + if (elecInfo != null && elecInfo.size() > 0) {
491 491 Double cdl = 0., hd = 0.;
492 492 for (ElecInfo ei : elecInfo) {
493 493 cdl = Arith.add(cdl, ei.getCdl());
... ...