'添加结算框计算'

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -46,11 +47,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getBatch")
@@ -70,11 +72,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 Integer pageNum,
                                                 Integer pageSize,
-                                                Integer apiId) {
+                                                Integer apiId,
+                                                String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("addPortHandlingFee")
@@ -106,11 +109,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                        Integer pageNum,
                                                        Integer pageSize,
-                                                       Integer apiId) {
+                                                       Integer apiId,
+                                                       String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("addDetailsOrder/{resultId}")
@@ -124,11 +128,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getLossStatementList")
@@ -136,11 +141,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getWaterResult")
@@ -176,15 +182,16 @@ public class BMSController extends BaseRESTfulController {
     @PostMapping("getStatementDetailsOrderList")
     @ApiOperation(value = "展示账单下的详单")
     public RESTfulResult getStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      BigDecimal batchId,
+                                                      Integer batchId,
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
-                                                      BigDecimal statementId) {
+                                                      Integer statementId,
+                                                      String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getStatementDetailsOrderList(batchId, mapValue, pageNum, pageSize, apiId,statementId);
+        return bmsshipFeign.getStatementDetailsOrderList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
     }
 
     @PostMapping("getShipResult")
@@ -223,11 +230,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getUncomplateTrainDetailsList")
@@ -235,11 +243,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                        Integer pageNum,
                                                        Integer pageSize,
-                                                       Integer apiId) {
+                                                       Integer apiId,
+                                                       String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getTrainResultList")
@@ -265,11 +274,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getStatementTrainResultList")
@@ -287,16 +297,17 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("getComplateTrainDetailsList")
     @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getComplateTrainDetailsList(BigDecimal batchId,
+    public RESTfulResult getComplateTrainDetailsList(Integer batchId,
                                                      @RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     BigDecimal statementId) {
+                                                     Integer statementId,
+                                                     String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getComplateTrainDetailsList(batchId,mapValue, pageNum, pageSize, apiId,statementId);
+        return bmstrainFeign.getComplateTrainDetailsList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
     }
 
     @PostMapping("addTrainStatement")
@@ -304,8 +315,8 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
         return bmstrainFeign.addTrainStatement(mapList);
     }
-  
-      @ApiModelProperty(value = "展示销售火运结算列表")
+
+    @ApiModelProperty(value = "展示销售火运结算列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -315,11 +326,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer apiId) {
+                                           Integer apiId,
+                                           String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @ApiModelProperty(value = "新增销售火运结算")
@@ -327,7 +339,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
     })
     @PostMapping("/addTrainSettlement")
-    public Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+    public Map<String, Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
         return bmstrainFeign.addTrainSettlement(bmstrainSettlement);
     }
 
@@ -336,7 +348,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
     })
     @PostMapping("/updateTrainSettlement")
-    public Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+    public Map<String, Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
         return bmstrainFeign.updateTrainSettlement(bmstrainSettlement);
     }
 
@@ -345,7 +357,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/deleteTrainSettlement/{settlementId}")
-    public Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
+    public Map<String, Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
         return bmstrainFeign.deleteTrainSettlement(settlementId);
     }
 
@@ -354,7 +366,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/selectTrainSettlement/{settlementId}")
-    public Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
+    public Map<String, Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
         return bmstrainFeign.selectTrainSettlement(new BigDecimal(settlementId));
     }
 
@@ -364,11 +376,12 @@ public class BMSController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  Integer orderType) {
+                                                  Integer orderType,
+                                                  String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
     }
 
     @PostMapping("getTruckResultList")
@@ -387,56 +400,60 @@ public class BMSController extends BaseRESTfulController {
     @PostMapping("getTruckStatementList")
     @ApiOperation(value = "展示汽运账单信息")
     public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId) {
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getInvoiceList")
     @ApiOperation(value = "展示发票")
     public RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId) {
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId);
+        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getSaleTruckStatementDetailsOrderList")
     @ApiOperation(value = "展示账单下的详单")
     public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  Integer statementId) {
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               Integer statementId,
+                                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
     }
 
     @PostMapping("getUnFinishedTruckDetailsOrderList")
     @ApiOperation(value = "展示汽运未生成账单的详单信息")
     public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                               Integer pageNum,
-                                                               Integer pageSize,
-                                                               Integer apiId,
-                                                               Integer orderType) {
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer orderType,
+                                                            String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
     }
 
     @PostMapping("addBmstruckInvoice")
     @ApiOperation(value = "新增发票")
-    RESTfulResult addBmstruckInvoice(@RequestBody Map<String,Object> mapVal) {
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal) {
         return bmstruckFeign.addBmstruckInvoice(mapVal);
     }
 
@@ -445,7 +462,7 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult updateBmstruckCheck(@RequestParam Integer statementId,
                                       @RequestParam Integer status,
                                       @RequestParam Integer person) {
-        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId),status,person);
+        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId), status, person);
     }
 
     @PostMapping("getSmallTruckFormula")
@@ -462,7 +479,7 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("addTruckStatement")
     @ApiOperation(value = "新增汽运详单")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String,Object>> mapList) {
+    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
         return bmstruckFeign.addTruckStatement(mapList);
     }
 
@@ -471,8 +488,10 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
         return bmstruckFeign.addTruckDetailsOrder(orderId);
     }
+
     /**
      * 展示汽运未生成账单的详单信息
+     *
      * @param mapVal
      * @param pageNum
      * @param pageSize
@@ -484,10 +503,10 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "orderType" ,value = "1:计时,2:计数，3：计重，4：包月",required = false,dataType = "Integer")
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
     })
     @PostMapping("/getUnFinishedConvertedTruckDetailsOrderList")
-    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapVal,
                                                                      Integer pageNum,
                                                                      Integer pageSize,
                                                                      Integer apiId,
@@ -505,6 +524,7 @@ public class BMSController extends BaseRESTfulController {
 
     /**
      * 生成内转汽运账单
+     *
      * @param mapList
      * @return
      */
@@ -515,12 +535,13 @@ public class BMSController extends BaseRESTfulController {
     }
 
     /**
-     *删除汽运账单
+     * 删除汽运账单
      */
     @PostMapping("/deleteConvertedTruckStatement/{statementId}")
     public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
         return bmstruckFeign.delete(statementId);
     }
+
     /**
      * 审批计费账单
      */

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

@@ -30,7 +30,8 @@ public interface BmsshipFeign {
     RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("apiId") Integer apiId);
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("con") String con);
 
     /**
      * 展示批次信息
@@ -96,7 +97,8 @@ public interface BmsshipFeign {
     RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("apiId") Integer apiId);
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("con") String con);
 
     /**
      * 展示未生成账单的详单信息
@@ -111,7 +113,8 @@ public interface BmsshipFeign {
     RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId);
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
 
     /**
      * 生成水运计费详单
@@ -137,7 +140,8 @@ public interface BmsshipFeign {
     RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam("pageNum") Integer pageNum,
                                    @RequestParam("pageSize") Integer pageSize,
-                                   @RequestParam("apiId") Integer apiId);
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("con") String con);
 
     /**
      * 展示途损费账单信息
@@ -152,7 +156,8 @@ public interface BmsshipFeign {
     RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
-                                       @RequestParam("apiId") Integer apiId);
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con);
 
     /**
      * 展示水分质检实绩
@@ -215,7 +220,8 @@ public interface BmsshipFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("apiId") Integer apiId,
-                                               @RequestParam BigDecimal statementId);
+                                               @RequestParam("statementId") BigDecimal statementId,
+                                               @RequestParam("con") String con);
 
     /**
      * 展示详单下的船运实绩

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

@@ -33,7 +33,8 @@ public interface BmstrainFeign {
     RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId);
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("con") String con);
 
     /**
      * 展示未转账单的火运详单
@@ -48,7 +49,8 @@ public interface BmstrainFeign {
     RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId);
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
 
     /**
      * 展示火运实绩
@@ -87,7 +89,8 @@ public interface BmstrainFeign {
     RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("con") String con);
 
     /**
      * 展示火运实绩
@@ -115,12 +118,13 @@ public interface BmstrainFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
-    RESTfulResult getComplateTrainDetailsList(@RequestParam BigDecimal batchId,
+    RESTfulResult getComplateTrainDetailsList(@RequestParam("batchId") BigDecimal batchId,
                                               @RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("statementId") BigDecimal statementId);
+                                              @RequestParam("statementId") BigDecimal statementId,
+                                              @RequestParam("con") String con);
 
     /**
      * 生成火运费账单
@@ -141,9 +145,10 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/getSettlementList")
     RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId);
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("con") String con);
 
     /**
      * 新增火运结算

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

@@ -31,7 +31,8 @@ public interface BmstruckFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("orderType") Integer orderType);
+                                           @RequestParam("orderType") Integer orderType,
+                                           @RequestParam("con") String con);
 
     /**
      * 展示汽运实绩信息
@@ -116,7 +117,8 @@ public interface BmstruckFeign {
     RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("con") String con);
 
     /**
      * 生成销售汽运计费账单
@@ -142,10 +144,12 @@ public interface BmstruckFeign {
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("statementId") BigDecimal statementId);
+                                                        @RequestParam("statementId") BigDecimal statementId,
+                                                        @RequestParam("con") String con);
 
     /**
      * 审核
+     *
      * @param statementId
      * @param status
      * @param person
@@ -158,6 +162,7 @@ public interface BmstruckFeign {
 
     /**
      * 查询销售汽运离100KM差距10KM内计费公式
+     *
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getSmallTruckFormula")
@@ -165,6 +170,7 @@ public interface BmstruckFeign {
 
     /**
      * 查询销售汽运离100KM差距10KM外计费公式
+     *
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getBigTruckFormula")
@@ -172,6 +178,7 @@ public interface BmstruckFeign {
 
     /**
      * 展示发票
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -182,10 +189,12 @@ public interface BmstruckFeign {
     RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                  @RequestParam("pageNum") Integer pageNum,
                                  @RequestParam("pageSize") Integer pageSize,
-                                 @RequestParam("apiId") Integer apiId);
+                                 @RequestParam("apiId") Integer apiId,
+                                 @RequestParam("con") String con);
 
     /**
      * 新增发票
+     *
      * @param mapVal
      * @return
      */
@@ -194,6 +203,7 @@ public interface BmstruckFeign {
 
     /**
      * 展示汽运未生成账单的详单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -203,8 +213,9 @@ public interface BmstruckFeign {
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getUnFinishedTruckDetailsOrderList")
     RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam("pageNum") Integer pageNum,
-                                     @RequestParam("pageSize") Integer pageSize,
-                                     @RequestParam("apiId") Integer apiId,
-                                     @RequestParam("orderType") Integer orderType);
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("con") String con);
 }