优化

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShips.java

@@ -2,6 +2,7 @@ package com.ruoyi.business.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,14 +31,34 @@ public class BjTrackShips extends BaseEntity {
     private Long trackShipsId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * 英文船名
+     */
+    private String shipNameEn;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
 
     /**
-     * 中文船名
+     * 初次登记号
      */
-    private String shipNameCn;
+    private String shipFirstregNo;
+
+    /**
+     * IMO
+     */
+    private String shipImo;
+
+    /**
+     * 牌薄号
+     */
+    private String icCardNo;
 
     /**
      * 国籍
@@ -50,11 +71,53 @@ public class BjTrackShips extends BaseEntity {
     private String regportName;
 
     /**
+     * 船舶种类
+     */
+    private String shipType;
+
+    /**
+     * 跟踪单位
+     */
+    private String traceUnit;
+
+    /**
+     * 跟踪状态
+     */
+    private String traceStatus;
+
+    /**
+     * 审核状态
+     */
+    private String auditStatus;
+
+    /**
+     * 申请列入机构
+     */
+    private String addOrganization;
+
+    /**
      * 跟踪原因
      */
     private String traceReason;
 
     /**
+     * 跟踪时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date traceDate;
+
+    /**
+     * 申请解除机构
+     */
+    private String removeOrganization;
+
+    /**
+     * 脱离时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date breakDate;
+
+    /**
      * 发布时间
      */
     private Date releaseDate;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipsBo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -28,14 +29,34 @@ public class BjTrackShipsBo extends BaseEntity {
     private Long trackShipsId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * 英文船名
+     */
+    private String shipNameEn;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
 
     /**
-     * 中文船名
+     * 初次登记号
      */
-    private String shipNameCn;
+    private String shipFirstregNo;
+
+    /**
+     * IMO
+     */
+    private String shipImo;
+
+    /**
+     * 牌薄号
+     */
+    private String icCardNo;
 
     /**
      * 国籍
@@ -48,11 +69,53 @@ public class BjTrackShipsBo extends BaseEntity {
     private String regportName;
 
     /**
+     * 船舶种类
+     */
+    private String shipType;
+
+    /**
+     * 跟踪单位
+     */
+    private String traceUnit;
+
+    /**
+     * 跟踪状态
+     */
+    private String traceStatus;
+
+    /**
+     * 审核状态
+     */
+    private String auditStatus;
+
+    /**
+     * 申请列入机构
+     */
+    private String addOrganization;
+
+    /**
      * 跟踪原因
      */
     private String traceReason;
 
     /**
+     * 跟踪时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date traceDate;
+
+    /**
+     * 申请解除机构
+     */
+    private String removeOrganization;
+
+    /**
+     * 脱离时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date breakDate;
+
+    /**
      * 发布时间
      */
     private Date releaseDate;
@@ -61,4 +124,24 @@ public class BjTrackShipsBo extends BaseEntity {
      * 是否已发布  0：未发布 1：已发布
      */
     private String releaseFlag;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startCheckDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endCheckDate;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startTraceDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endTraceDate;
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipsVo.java

@@ -27,14 +27,34 @@ public class BjTrackShipsVo implements Serializable {
     private Long trackShipsId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * 英文船名
+     */
+    private String shipNameEn;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
 
     /**
-     * 中文船名
+     * 初次登记号
      */
-    private String shipNameCn;
+    private String shipFirstregNo;
+
+    /**
+     * IMO
+     */
+    private String shipImo;
+
+    /**
+     * 牌薄号
+     */
+    private String icCardNo;
 
     /**
      * 国籍
@@ -47,11 +67,53 @@ public class BjTrackShipsVo implements Serializable {
     private String regportName;
 
     /**
+     * 船舶种类
+     */
+    private String shipType;
+
+    /**
+     * 跟踪单位
+     */
+    private String traceUnit;
+
+    /**
+     * 跟踪状态
+     */
+    private String traceStatus;
+
+    /**
+     * 审核状态
+     */
+    private String auditStatus;
+
+    /**
+     * 申请列入机构
+     */
+    private String addOrganization;
+
+    /**
      * 跟踪原因
      */
     private String traceReason;
 
     /**
+     * 跟踪时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date traceDate;
+
+    /**
+     * 申请解除机构
+     */
+    private String removeOrganization;
+
+    /**
+     * 脱离时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date breakDate;
+
+    /**
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipsMapper.xml

@@ -5,24 +5,73 @@
 <mapper namespace="com.ruoyi.business.mapper.BjTrackShipsMapper">
     <resultMap id="trackShipsVoList" type="com.ruoyi.business.domain.vo.BjTrackShipsVo">
         <result property="trackShipsId" column="track_ships_id"/>
-        <result property="shipId" column="ship_id"/>
         <result property="shipNameCn" column="ship_name_cn"/>
+        <result property="shipNameEn" column="ship_name_en"/>
+        <result property="shipId" column="ship_id"/>
+        <result property="shipFirstregNo" column="ship_firstreg_no"/>
+        <result property="shipImo" column="ship_imo"/>
+        <result property="icCardNo" column="ic_card_no"/>
         <result property="nationality" column="nationality"/>
-        <result property="traceReason" column="deletionReason"/>
+        <result property="regportName" column="regport_name"/>
+        <result property="shipType" column="ship_type"/>
+        <result property="traceUnit" column="trace_unit"/>
+        <result property="traceStatus" column="trace_status"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="addOrganization" column="add_organization"/>
+        <result property="traceReason" column="trace_reason"/>
+        <result property="traceDate" column="trace_date"/>
+        <result property="removeOrganization" column="remove_organization"/>
+        <result property="breakDate" column="break_date"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
     </resultMap>
     <select id="queryTrackShipsList" resultMap="trackShipsVoList">
         select track_ships_id,
-               ship_id,
                ship_name_cn,
+               ship_name_en,
+               ship_id,
+               ship_firstreg_no,
+               ship_imo,
+               ic_card_no,
                nationality,
                regport_name,
+               ship_type,
+               trace_unit,
+               trace_status,
+               audit_status,
+               add_organization,
                trace_reason,
+               trace_date,
+               remove_organization,
+               break_date,
                release_date,
                release_flag
-        from ry.bj_track_ships
+        from bj_track_ships
         where del_flag = '0'
+        <if test="bo.shipNameCn != null and bo.shipNameCn != ''">
+            and ship_came_cn like concat('%',#{bo.shipNameCn},'%')
+        </if>
+        <if test="bo.shipNameEn != null and bo.shipNameEn != ''">
+            and ship_came_en like concat('%',#{bo.shipNameEn},'%')
+        </if>
+        <if test="bo.shipId != null and bo.shipId != ''">
+            and ship_id like concat('%',#{bo.shipId},'%')
+        </if>
+        <if test="bo.shipFirstregNo != null and bo.shipFirstregNo != ''">
+            and ship_firstreg_no like concat('%',#{bo.shipFirstregNo},'%')
+        </if>
+        <if test="bo.shipImo != null and bo.shipImo != ''">
+            and ship_imo like concat('%',#{bo.shipImo},'%')
+        </if>
+        <if test="bo.icCardNo != null and bo.icCardNo != ''">
+            and ic_card_no like concat('%',#{bo.icCardNo},'%')
+        </if>
+        <if test="bo.startCheckDate != null and bo.endCheckDate != null">
+            and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
+        </if>
+        <if test="bo.startTraceDate != null and bo.endTraceDate != null">
+            and trace_date between #{bo.startTraceDate} and #{bo.endTraceDate}
+        </if>
         order by track_ships_id,
                  RANDOM()
     </select>