修改uc

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

@@ -434,6 +434,31 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "二程船结算用：查询发货通知的已下发批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getBatchOfNotice")
+    public RESTfulResult getBatchOfNotice(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getBatchOfNotice(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
 
     @ApiModelProperty(value = "查询存在装船作业并且尚未计算水运费的批次")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -235,6 +235,8 @@ public interface UniversalMapper {
 
     List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
 
+    List<Map<String,Object>> getBatchOfNotice(Map<String,Object> map);
+
     List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
 
     List<Map<String,Object>> getInwardSendStation();

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

@@ -1217,6 +1217,32 @@
                  </if>
     </select>
 
+    <select id="getBatchOfNotice" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        DBI.BATCH_ID "batchId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        RM.MATERIAL_NAME "materialName",
+        RP.PORT_NAME "portName",
+        RPT.PORT_TYPE_NAME "portTypeName"
+        from AMSSHIP_DELIVERY_NOTICE ADN
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+        LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID=DBI.BATCH_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.BATCH_ID=DB.BATCH_ID
+        LEFT JOIN RMS_PORT RP ON ADN.PORT_ID=RP.PORT_ID
+        LEFT JOIN RMS_PORT_TYPE RPT ON RP.PORT_TYPE_ID=RPT.PORT_TYPE_ID
+        LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+        WHERE RP.PORT_TYPE_ID IS NOT NULL
+        AND APO.PURCHASE_ORDER_NO IS NOT NULL
+        AND RP.DELETED=0
+        AND ADN.NOTICE_DISTRIBUTION_STATUS=1
+        AND ADN.DELETED=0
+        <if test="index!=null and index!=''.toString()">
+            and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+
     <select id="findBatchHavingLoad" resultType="java.util.Map">
         SELECT  distinct	db.BATCH_ID "batchId",
         db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",