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

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

@@ -2000,6 +2000,16 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="查询内转运输实绩")
+    @PostMapping("/getInwardReport")
+    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);

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

@@ -436,6 +436,14 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
+//内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
+    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);