优化

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

@@ -40,6 +40,11 @@ public class BjBuildCheck extends BaseEntity {
     private String shipyard;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船舶检验机构
      */
     private String shipCheckOrganization;

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

@@ -30,6 +30,16 @@ public class BjPortReport extends BaseEntity {
     private Long portReportId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * IMO编号
+     */
+    private String shipImo;
+
+    /**
      * 报告编号
      */
     private String reportCode;

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

@@ -40,6 +40,11 @@ public class BjServiceCheck extends BaseEntity {
     private String shipId;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船籍港
      */
     private String regportName;

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

@@ -38,6 +38,11 @@ public class BjBuildCheckBo extends BaseEntity {
     private String shipyard;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船舶检验机构
      */
     private String shipCheckOrganization;
@@ -112,4 +117,14 @@ public class BjBuildCheckBo extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startCheckDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endCheckDate;
+
 }

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

@@ -29,6 +29,16 @@ public class BjPortReportBo extends BaseEntity {
     private Long portReportId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * IMO编号
+     */
+    private String shipImo;
+
+    /**
      * 报告编号
      */
     private String reportCode;
@@ -93,4 +103,34 @@ public class BjPortReportBo extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startEndDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endEndDate;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startDeclareDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endDeclareDate;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startReleaseDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endReleaseDate;
+
 }

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

@@ -40,6 +40,11 @@ public class BjServiceCheckBo extends BaseEntity {
     private String shipId;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船籍港
      */
     private String regportName;
@@ -94,4 +99,14 @@ public class BjServiceCheckBo extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startCheckDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endCheckDate;
+
 }

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

@@ -36,6 +36,11 @@ public class BjBuildCheckVo implements Serializable {
     private String shipyard;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船舶检验机构
      */
     private String shipCheckOrganization;

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

@@ -27,6 +27,16 @@ public class BjPortReportVo implements Serializable {
     private Long portReportId;
 
     /**
+     * 中文船名
+     */
+    private String shipNameCn;
+
+    /**
+     * IMO编号
+     */
+    private String shipImo;
+
+    /**
      * 报告编号
      */
     private String reportCode;

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

@@ -39,6 +39,11 @@ public class BjServiceCheckVo implements Serializable {
     private String shipId;
 
     /**
+     * 船舶登记号
+     */
+    private String shipRegisterNumber;
+
+    /**
      * 船籍港
      */
     private String regportName;

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

@@ -40,8 +40,17 @@
                defect,
                release_date,
                release_flag
-        from ry.bj_build_check
+        from bj_build_check
         where del_flag = '0'
+        <if test="bo.shipyard != null and bo.shipyard != ''">
+            and shipyard like concat('%',#{bo.shipyard},'%')
+        </if>
+        <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
+            and ship_id like concat('%',#{bo.shipRegisterNumber},'%')
+        </if>
+        <if test="bo.startCheckDate != null and bo.endCheckDate != null">
+            and check_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
+        </if>
         order by build_check_id,
                  RANDOM()
     </select>

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

@@ -5,6 +5,8 @@
 <mapper namespace="com.ruoyi.business.mapper.BjPortReportMapper">
     <resultMap id="portReportVoList" type="com.ruoyi.business.domain.vo.BjPortReportVo">
         <result property="portReportId" column="port_report_id"/>
+        <result property="shipImo" column="ship_imo"/>
+        <result property="shipNameCn" column="ship_name_cn"/>
         <result property="reportCode" column="report_code"/>
         <result property="reportOrganization" column="report_organization"/>
         <result property="reportType" column="report_type"/>
@@ -20,6 +22,8 @@
     </resultMap>
     <select id="queryPortReportList" resultMap="portReportVoList">
         select port_report_id,
+               ship_name_cn,
+               ship_imo,
                report_code,
                report_organization,
                report_type,
@@ -32,8 +36,26 @@
                declare_date,
                release_date,
                release_flag
-        from ry.bj_port_report
+        from bj_port_report
         where del_flag = '0'
+        <if test="bo.shipImo != null and bo.shipImo != ''">
+            and ship_imo like concat('%',#{bo.shipImo},'%')
+        </if>
+        <if test="bo.shipNameCn != null and bo.shipNameCn != ''">
+            and ship_came_cn like concat('%',#{bo.shipNameCn},'%')
+        </if>
+        <if test="bo.voyageNumber != null and bo.voyageNumber != ''">
+            and voyage_number like concat('%',#{bo.voyageNumber},'%')
+        </if>
+        <if test="bo.startEndDate != null and bo.endEndDate != null">
+            and end_date between #{bo.startEndDate} and #{bo.endEndDate}
+        </if>
+        <if test="bo.startDeclareDate != null and bo.endDeclareDate != null">
+            and declare_date between #{bo.startDeclareDate} and #{bo.endDeclareDate}
+        </if>
+        <if test="bo.startReleaseDate != null and bo.endReleaseDate != null">
+            and release_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
+        </if>
         order by port_report_id,
                  RANDOM()
     </select>

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

@@ -32,8 +32,17 @@
                defect,
                release_date,
                release_flag
-        from ry.bj_service_check
+        from bj_service_check
         where del_flag = '0'
+        <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
+            and ship_id like concat('%',#{bo.shipRegisterNumber},'%')
+        </if>
+        <if test="bo.shipImo != null and bo.shipImo != ''">
+            and ship_imo like concat('%',#{bo.shipImo},'%')
+        </if>
+        <if test="bo.startCheckDate != null and bo.endCheckDate != null">
+            and check_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
+        </if>
         order by service_check_id,
                  RANDOM()
     </select>