修改统计报表

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

@@ -1924,35 +1924,40 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
+                                             String startTime, String endTime,
                                                Integer orderType
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
     }
     @ApiOperation(value="查询辅料燃料统计报表")
     @PostMapping("/getAllSaleReport")
     public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize, String carrierSsoId
+                                          Integer pageSize,
+                                          String startTime, String endTime,
+                                          String carrierSsoId
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
     }
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 Integer apiId,
                                                 Integer pageNum,
-                                                Integer pageSize, String carrierSsoId
+                                                Integer pageSize,
+                                                String startTime, String endTime,
+                                                String carrierSsoId
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
     }
     @ApiOperation(value="查询零星物资出厂统计报表")
     @PostMapping("/getSporadicSuppliesReport2")
     public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 Integer apiId,
                                                 Integer pageNum,
-                                                Integer pageSize, String carrierSsoId
+                                                Integer pageSize, String startTime, String endTime, String carrierSsoId
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime, carrierSsoId);
     }
 }

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

@@ -345,6 +345,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime")   String endTime,
                                       @RequestParam("orderType") Integer orderType
     );
 
@@ -361,6 +363,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId
     );
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
@@ -368,6 +372,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime")   String endTime,
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
@@ -375,6 +381,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 }

src/main/resources/application-dev.yml

@@ -18,11 +18,11 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8017}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}