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

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

@@ -1972,6 +1972,26 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
     }
 
+    @ApiOperation(value="查询倒库实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(516)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllReverseResult")
+    public RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con,
+                                              String  userId,
+                                              String startTime,
+                                              String endTime){
+        return tmsTruckFeign.getAllReverseResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
+    }
+
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
     @PostMapping("/addSteelNzReceiptResult")
     public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -353,6 +353,16 @@ public interface TmsTruckFeign {
                                               @RequestParam("endTime") String endTime,
                                               @RequestParam("orderType")Integer orderType);
 
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getAllReverseResult")
+    RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);