合计重+计时结算

src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java

@@ -267,5 +267,38 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         int i = bmstruckDetailsOrderService.updateDetails();
         return i;
     }
+    /*
+   内转计重+计时计费详单
+    */
+    @PostMapping("/getInwardWeightTimeDetailsOrder")
+    public RESTfulResult getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String,Object>mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String carrierSsoId,
+                                                     Integer detailStatus,
+                                                     Integer orderType,
+                                                     String userId,
+                                                     String startTime,
+                                                     String endTime){
+        if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
+            carrierSsoId = null;
+        }
+        if (carrierSsoId != null) {
+            BigDecimal carrierId = bmstruckDetailsOrderService.getCarrierIdBySSO(carrierSsoId);
+            mapValue.put("carrierId",carrierId);
+        }
+        if(userId != null){
+            mapValue.put("userId","%"+ userId +"%");
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        mapValue.put("detailStatus",detailStatus);
+        List<Map<String, Object>> truckDetailList = bmstruckDetailsOrderService.getInwardWeightTimeDetailsOrder(mapValue,orderType);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getInwardWeightTimeDetailsOrder(mapValue,orderType);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckDetailList, columnList);
+        return success(data);
+    }
 
 }

src/main/java/com/steerinfo/dil/service/IBmstruckDetailsOrderService.java

@@ -106,4 +106,7 @@ public interface IBmstruckDetailsOrderService {
     int inserInwardOrder(Map<String, Object> mapVal);
 
     int updateDetails();
+
+    List<Map<String, Object>> getInwardWeightTimeDetailsOrder(Map<String, Object> mapValue,Integer orderType);
+
 }

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

@@ -642,4 +642,24 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         }
         return i;
     }
+    /*
+    内转计重+计时计费详单
+     */
+    @Override
+    public List<Map<String, Object>> getInwardWeightTimeDetailsOrder(Map<String, Object> mapValue, Integer orderType) {
+
+        List<Map<String,Object>>mapListWeight = new ArrayList<>();
+        List<Map<String,Object>>mapListTime = new ArrayList<>();
+               //计重计费详单查询结果
+               mapListWeight = bmstruckDetailsOrderMapper.getInwardWeightDetailsOrder(mapValue);
+               //计时计费详单查询结果
+               mapListTime = bmstruckDetailsOrderMapper.getInwardTimeDetailsOrder(mapValue);
+               //将计时查询结果加入到计重查询结果中
+               for(Map<String, Object> mapListTimeOne:mapListTime)
+           {
+               mapListWeight.add(mapListTimeOne);
+           }
+               //返回计重+计时计费详单查询结果
+        return mapListWeight;
+    }
 }