提交

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

@@ -1069,7 +1069,7 @@ public class AMScontroller{
     }
     //删除用车需求
     @PostMapping("/deleteTruckRequirement/{requirementId}")
-    public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
+    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
     //下发用车需求

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

@@ -1818,9 +1818,11 @@ public class TMSController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               String con,
-                                              String  userId
+                                              String  userId,
+                                              String startTime,
+                                              String endTime
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -1933,7 +1935,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String startTime, String endTime,
+                                               String startTime,
+                                               String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1944,7 +1947,8 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          String startTime, String endTime,
+                                          String startTime,
+                                          String endTime,
                                           String carrierSsoId
     ){
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);

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

@@ -330,7 +330,9 @@ public interface TmsTruckFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId);
+                                              @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);

src/main/resources/application-dev.yml

@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8