船闸进出港申报调整

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/service/impl/CommonServiceImpl.java

@@ -269,12 +269,14 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public CargoInfoForShipLockVo selectCargoDeclareInfoByShipId(String shipId) {
-        String endPartition = DateUtils.dateToString(new Date(), "yyyyMMdd");
-        String startPartition = DateUtils.dateToString(DateUtils.dayAddNum(new Date(), -1), "yyyyMMdd");
+        String startPartition3 = DateUtils.dateToString(new Date(), "yyyyMMdd");
+        String startPartition2 = DateUtils.dateToString(DateUtils.dayAddNum(new Date(), -1), "yyyyMMdd");
+        String startPartition1 = DateUtils.dateToString(DateUtils.dayAddNum(new Date(), -1), "yyyyMMdd");
         String partitionPrefix = "SHIP_REPORT_";
         ArrayList<String> list = new ArrayList<>();
-        list.add(partitionPrefix + startPartition);
-        list.add(partitionPrefix + endPartition);
+        list.add(partitionPrefix + startPartition1);
+        list.add(partitionPrefix + startPartition2);
+        list.add(partitionPrefix + startPartition3);
         List<CargoInfoForShipLockVo> cargoInfoForShipLockVo = mapper.selectCargoDeclareInfoByShipId(shipId, list);
         if (cargoInfoForShipLockVo.isEmpty()) {
             return new CargoInfoForShipLockVo();

ghjg-item-datashare-server/src/main/resources/mapper/CommonMapper.xml

@@ -343,6 +343,7 @@
   </select>
     <select id="selectCargoDeclareInfoByShipId"
             resultType="com.shanghaichengdi.ghjgitem.vo.CargoInfoForShipLockVo">
+        select * from (
         <foreach collection="list" item="item" index="index" separator="union all">
             select c.ship_id shipId,
             c.SHIP_NAME_CN shipName,
@@ -352,17 +353,20 @@
             r.GOODS_CODE cargoCode,
             r.specific_name cargoName,
             c.actual_carrying_capacity actualLoad,
-            c.PRE_PORT_NAME startPort,
-            c.pre_port_code startPortCode,
-            c.next_port_code nextPortCode,
-            c.next_port_name nextPort,
-            c.LAST_UPDATE_DATE lastUpdateDate
+            decode(c.ARRIVAL_OR_LEAVE,0,c.PRE_PORT_NAME,1,c.REPORT_PORT_NAME) startPort,
+            decode(c.ARRIVAL_OR_LEAVE,0,c.PRE_PORT_CODE,1,c.REPORT_PORT_CODE) startPortCode,
+            decode(c.ARRIVAL_OR_LEAVE,0,c.REPORT_PORT_CODE,1,c.next_port_code) nextPortCode,
+            decode(c.ARRIVAL_OR_LEAVE,0,c.REPORT_PORT_NAME,1,c.next_port_name) nextPort,
+            c.LAST_UPDATE_DATE lastUpdateDate,
+            c.report_time reportTime
             from ghjg_basics.c_cb_ship_eep_report_rec partition(${item}) c
             left join ghjg_basics.c_cb_cargo_declare_rec r
             on c.report_id = r.report_id
             left join ghjg_basics.d_cb_cargo_type d on r.type_code = d.code
             where c.SHIP_ID = #{shipId}
         </foreach>
+        ) t
+        where t.reportTime >= sysdate-2 and t.reportTime &lt;= sysdate
     </select>
 
     <select id="getPdShipCountByMmsi" resultType="java.lang.Integer">