Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1906,5 +1906,13 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
     }
-
+    @ApiOperation(value="查询辅料燃料统计报表")
+    @PostMapping("/getAllSaleReport")
+    public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize, String carrierSsoId
+    ){
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+    }
 }

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -354,6 +354,14 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer orderType,
                                           @RequestParam Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
+    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("carrierSsoId")   String carrierSsoId
+    );
 }