tiajoidf

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

@@ -1323,8 +1323,10 @@ public class AMScontroller{
                                                Integer sporadicStatus,
                                                String carrierSsoId,
                                                String userId,
-                                               String userIds) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds);
+                                               String userIds,
+                                               String startTime,
+                                               String endTime) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds,startTime,endTime);
     }
 
     @ApiModelProperty(value = "查看物资详情")

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

@@ -745,8 +745,10 @@ public class OMSController {
                                                  String  con,
                                                  String userId,
                                                  String usersId,
-                                                       Integer type1) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1);
+                                                       Integer type1,
+                                                       String startTime,
+                                                       String endTime) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1,startTime,endTime);
     }
 
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")

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

@@ -1318,8 +1318,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer orderType,
                                                  String con,
                                                  String userId,
-                                                 String userIds){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                 String userIds,
+                                                 String startTime,
+                                                 String endTime){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "查询计皮实绩")
@@ -1379,9 +1381,11 @@ public class TMSController extends BaseRESTfulController {
                                                Integer orderType,
                                                String con,
                                                String userId,
-                                               String userIds
+                                               String userIds,
+                                               String startTime,
+                                               String endTime
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "添加卸货实绩")

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

@@ -1299,7 +1299,9 @@ public interface AmsFeign {
                                               @RequestParam Integer sporadicStatus,
                                               @RequestParam String carrierSsoId,
                                               @RequestParam String userId,
-                                              @RequestParam String userIds);
+                                              @RequestParam String userIds,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -391,7 +391,9 @@ public interface OmsFeign {
                                                        @RequestParam("con") String con,
                                                        @RequestParam("userId") String userId,
                                                        @RequestParam("usersId") String usersId,
-                                                       @RequestParam("type1")Integer type1
+                                                       @RequestParam("type1")Integer type1,
+                                                @RequestParam("startTime")String  startTime,
+                                                @RequestParam("endTime") String endTime
                                                        );
 
     @ApiOperation(value = "根据运输订单id修改运力id")

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

@@ -147,7 +147,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 String startTime,
+                                                 @RequestParam String endTime
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -179,7 +181,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/tmstruckunloadresult/addUnloadResult")