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

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

@@ -179,11 +179,12 @@ public class BMSController extends BaseRESTfulController {
                                                       BigDecimal batchId,
                                                       Integer pageNum,
                                                       Integer pageSize,
-                                                      Integer apiId) {
+                                                      Integer apiId,
+                                                      BigDecimal statementId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getStatementDetailsOrderList(batchId, mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getStatementDetailsOrderList(batchId, mapValue, pageNum, pageSize, apiId,statementId);
     }
 
     @PostMapping("getShipResult")
@@ -303,6 +304,59 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map) {
         return bmstrainFeign.addTrainStatement(map);
     }
+  
+      @ApiModelProperty(value = "展示销售火运结算列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "180", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSettlementList")
+    public RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiModelProperty(value = "新增销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
+    })
+    @PostMapping("/addTrainSettlement")
+    public Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+        return bmstrainFeign.addTrainSettlement(bmstrainSettlement);
+    }
+
+    @ApiModelProperty(value = "修改销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
+    })
+    @PostMapping("/updateTrainSettlement")
+    public Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+        return bmstrainFeign.updateTrainSettlement(bmstrainSettlement);
+    }
+
+    @ApiModelProperty(value = "逻辑删除销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/deleteTrainSettlement/{settlementId}")
+    public Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
+        return bmstrainFeign.deleteTrainSettlement(settlementId);
+    }
+
+    @ApiModelProperty(value = "得到修改渲染")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectTrainSettlement/{settlementId}")
+    public List<Map<String,Object>> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
+        return bmstrainFeign.selectTrainSettlement(settlementId);
+    }
 
     @PostMapping("getTruckDetailsOrderList")
     @ApiOperation(value = "展示汽运详单信息")

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

@@ -214,7 +214,8 @@ public interface BmsshipFeign {
                                                @RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("apiId") Integer apiId);
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam BigDecimal statementId);
 
     /**
      * 展示详单下的船运实绩

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

@@ -2,11 +2,13 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -128,5 +130,51 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/addTrainStatement")
     RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map);
+  
+  /**
+     * 展示销售火运结算列表
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @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);
+
+    /**
+     * 新增火运结算
+     * @param bmstrainSettlement
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/addTrainSettlement")
+    Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
+
+    /**
+     * 修改火运结算
+     * @param bmstrainSettlement
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/updateTrainSettlement")
+    Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
+
+    /**
+     * 逻辑删除火运结算
+     * @param settlementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/deleteTrainSettlement/{settlementId}")
+    Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
+
+    /**
+     * 得到修改渲染
+     * @param settlementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/selectTrainSettlement/{settlementId}")
+    List<Map<String,Object>> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
 
 }