fdfdsfs

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

@@ -1187,8 +1187,9 @@ public class TMSController extends BaseRESTfulController {
                                           Integer orderType,
                                           String con,
                                           String userId,
-                                          String userIds){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds);
+                                          String userIds,
+                                                String startTime,String endTime){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "新增采购汽车装车实绩")
@@ -2218,9 +2219,10 @@ public class TMSController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            String startTime,
-                                           String endTime
+                                           String endTime,
+                                                 String con
     ){
-        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
     }
 
 

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

@@ -59,7 +59,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("con")   String con,
                                           @RequestParam("userId") String userId,
-                                          @RequestParam("userIds") String userIds
+                                          @RequestParam("userIds") String userIds,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("endTime") String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
@@ -525,7 +527,8 @@ public interface TmsTruckFeign {
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam String startTime,
-                                     @RequestParam String endTime);
+                                     @RequestParam String endTime,
+                                          @RequestParam String con);
 
 
     @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")