Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1421,11 +1421,13 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String consigneeSsoId,
-                                                  @RequestParam(required = false) String con) {
+                                                  @RequestParam(required = false) String con,
+                                                  String startTime,
+                                                  String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1435,11 +1437,13 @@ public class AMScontroller{
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
                                                @RequestParam(required = false) String consigneeSsoId,
-                                               @RequestParam(required = false) String con){
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1456,11 +1460,11 @@ public class AMScontroller{
                                                               String con,
                                                               Integer shipperId,
                                                               Integer saleType,
-                                                              String consigneeSsoId
-//                                                              String startDate,
-//                                                              String endDate
+                                                              String consigneeSsoId,
+                                                              String startTime,
+                                                              String endTime
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1927,9 +1931,11 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String con,
-                                                        String consigneeSsoId
+                                                        String consigneeSsoId,
+                                                        String startTime,
+                                                        String endTime
     ) {
-        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId);
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime);
     }
 
 }

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

@@ -1353,7 +1353,9 @@ public interface AmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
                                            @RequestParam(required = false) String consigneeSsoId,
-                                           @RequestParam(required = false) String con);
+                                           @RequestParam(required = false) String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1365,7 +1367,9 @@ public interface AmsFeign {
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
                                                @RequestParam(required = false) String consigneeSsoId,
-                                               @RequestParam(required = false) String con);
+                                               @RequestParam(required = false) String con,
+                                               @RequestParam String startTime,
+                                               @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1375,9 +1379,9 @@ public interface AmsFeign {
                                                        @RequestParam("con") String con,
                                                        @RequestParam Integer shipperId,
                                                        @RequestParam(required = false) Integer saleType,
-                                                       @RequestParam(required = false) String consigneeSsoId
-//                                                       @RequestParam String startDate,
-//                                                       @RequestParam String endDate
+                                                       @RequestParam(required = false) String consigneeSsoId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime
     );
 
     @ApiOperation(value="查询财务已审批销售订单信息")
@@ -1685,5 +1689,7 @@ public interface AmsFeign {
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
                                                  @RequestParam String con,
-                                                 @RequestParam String consigneeSsoId);
+                                                 @RequestParam String consigneeSsoId,
+                                                 @RequestParam(required = false) String startTime,
+                                                 @RequestParam(required = false) String endTime);
 }