tj

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

@@ -1965,9 +1965,10 @@ public class TMSController extends BaseRESTfulController {
                                               String con,
                                               String  userId,
                                               String startTime,
-                                              String endTime
+                                              String endTime,
+                                              Integer orderType
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -2676,4 +2677,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> changeNumber(@RequestParam String orderNumber){
         return tmsTruckFeign.changeNumber(orderNumber);
     }
+//    @ApiOperation(value="测试-新增计费详单")
+//    @PostMapping("/genernateInwardTime")
+//    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map){
+//        return  tmsTruckFeign.genernateInwardTime(map);
+//    }
 }

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

@@ -350,7 +350,8 @@ public interface TmsTruckFeign {
                                               @RequestParam("con") String con,
                                               @RequestParam("userId") String userId,
                                               @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime);
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orderType")Integer orderType);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -750,7 +751,8 @@ public interface TmsTruckFeign {
     @PostMapping("/api/v1/truckTms/tmstrucksmsrusults/sendMeaage")
     Map<String, Object> sendMeaage(@RequestParam String mobile,
                                    @RequestParam String content);
-
+  /* @PostMapping("/api/v1/truckTms/tmstrucktimetaskresults/genernateInwardTime")
+    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map);*/
 }