三程船水运结算

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

@@ -727,13 +727,21 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.getTruckDetailsByBatch(batchId);
     }
 
+
     /**
      * 根据批次查询装船作业
      * @param
      * @return
      */
-    @PostMapping("/findLoadByBatch/{batchId}")
-    public Map<String,Object> findLoadByBatch(@PathVariable("batchId") BigDecimal batchId){
-        return bmsshipFeign.findLoadByBatch(batchId);
+    @PostMapping("/findLoadByBatch")
+    public Map<String,Object> findLoadByBatch(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      BigDecimal batchId){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.findLoadByBatch(mapVal, pageNum, pageSize, apiId,batchId);
     }
 }

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

@@ -307,6 +307,10 @@ public interface BmsshipFeign {
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
     Map<String,Object> findBatchHavingLoad(String con);
 
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch/{batchId}")
-    Map<String,Object> findLoadByBatch(@PathVariable("batchId")BigDecimal batchId);
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch")
+    Map<String, Object> findLoadByBatch(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("batchId") BigDecimal batchId);
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1220,10 +1220,6 @@
         LEFT JOIN RMS_MATERIAL rm
         ON rm.MATERIAL_ID=db.MATERIAL_ID
         WHERE     tlsr.DELETED=0
-        and db.BATCH_ID not in (
-        select DISTINCT BATCH_ID
-        from BMSSHIP_FEE bf
-        where FEE_TYPE=3 and bf.DELETED=0)
         <if test="index!=null">
             and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
         </if>