fix

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

@@ -150,7 +150,7 @@ public class CommonServiceImpl implements CommonService {
         List<String> tableNameList = new ArrayList<>();
         String partitionPrefix = "SHIP_REPORT_";
         datesBetween.forEach(
-                x -> tableNameList.add("SHIP_REPORT " + "partition(" +
+                x -> tableNameList.add("GHJG_BASICS.c_cb_ship_eep_report_rec " + "partition(" +
                         partitionPrefix + x + ")" + " t"));
         log.info("查询的表名为:{}", JSONObject.toJSONString(tableNameList));
 

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

@@ -243,19 +243,19 @@
     t.MMSI mmsi,
     t.BID_NAME bidName,
     t.MOBILE_PHONE mobilePhone
-      from
-      (
-      <foreach item="item" collection="partition" separator="union">
-          select * from ${item}
-      </foreach>
-      ) t
-    left join ghjg_basics.dict_district_port p on p.berthname = t.berth_name and p.valid = '有效'
-    and p.lochus != '注销'
-    where 1 = 1
-      and (REPORT_PORT_CODE like '31%'
-      or NEXT_PORT_CODE like '31%'
-      or PRE_PORT_CODE like '31%')
-      and p.team = '浦东新区'
+          from
+          (
+          <foreach item="item" collection="partition" separator="union">
+              select * from ${item}
+          </foreach>
+          ) t
+        left join ghjg_basics.dict_district_port p on p.berthname = t.berth_name and p.valid = '有效'
+        and p.lochus != '注销'
+        where 1 = 1
+          and (REPORT_PORT_CODE like '31%'
+          or NEXT_PORT_CODE like '31%'
+          or PRE_PORT_CODE like '31%')
+          and p.team = '浦东新区'
     <if test="reportId != '' and reportId != null">
       and t.REPORT_ID = #{reportId}
     </if>
@@ -424,9 +424,6 @@
           <if test="shipId != null">
               and b.ship_id = #{shipId}
           </if>
-          <if test="shipName != null">
-              and b.ship_name_cn = #{shipName}
-          </if>
           and t.GPSTIME > sysdate - 1/24
           and t.MAPX > -2000 and t.MAPX &lt; 48000
           and t.MAPY > -48000 and t.MAPY &lt; 18000