修改计重+计时合并

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -652,11 +652,15 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         List<Map<String,Object>>mapListTime = new ArrayList<>();
                //计重计费详单查询结果
                mapListWeight = bmstruckDetailsOrderMapper.getInwardWeightDetailsOrder(mapValue);
+               for(Map<String, Object> mapListWeightOne : mapListWeight)
+               {
+                    mapListWeightOne.put("resultTime","null");
+               }
                //计时计费详单查询结果
                mapListTime = bmstruckDetailsOrderMapper.getInwardTimeDetailsOrder(mapValue);
                //将计时查询结果加入到计重查询结果中
                for(Map<String, Object> mapListTimeOne:mapListTime)
-           {
+           {    mapListTimeOne.put("capacityNumber",mapListTimeOne.remove("capacityNum"));
                mapListWeight.add(mapListTimeOne);
            }
                //返回计重+计时计费详单查询结果