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

@@ -51,6 +51,11 @@ public class BjShipsRegistration extends BaseEntity {
     private String shipFirstregNo;
 
     /**
+     * 船籍港
+     */
+    private String regportName;
+
+    /**
      * 船舶所有人
      */
     private String shipOwner;

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

@@ -80,6 +80,11 @@ public class BjAdministrativePunishBo extends BaseEntity {
     private Integer processType;
 
     /**
+     * 处罚种类
+     */
+    private Integer processSort;
+
+    /**
      * 处罚决定时间
      */
     private Date decisionDate;
@@ -125,11 +130,21 @@ public class BjAdministrativePunishBo extends BaseEntity {
     private String punishAmount;
 
     /**
+     * 海内河船
+     */
+    private String inlandShips;
+
+    /**
      * 航运公司
      */
     private String shipCompany;
 
     /**
+     * 水域类别
+     */
+    private String waterAreaType;
+
+    /**
      * 发布时间
      */
     private String declareDate;
@@ -165,6 +180,12 @@ public class BjAdministrativePunishBo extends BaseEntity {
     private String breakReason;
 
     /**
+     * 处罚决定日期数组
+     */
+    @Schema(description = "处罚决定日期数组")
+    private String [] decisionDates;
+
+    /**
      * 开始时间搜索使用
      */
     private String startDecisionDate;

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

@@ -48,6 +48,16 @@ public class BjBuildCheckBo extends BaseEntity {
     private String shipCheckOrganization;
 
     /**
+     * 国际/国内
+     */
+    private String countryType;
+
+    /**
+     * 检查机构
+     */
+    private String checkOrganization;
+
+    /**
      * 检查人员
      */
     private String checkPerson;
@@ -58,11 +68,16 @@ public class BjBuildCheckBo extends BaseEntity {
     private Date checkDate;
 
     /**
-     * 船舶种类
+     * 船舶类型
      */
     private String shipType;
 
     /**
+     * 船舶种类
+     */
+    private String shipSort;
+
+    /**
      * 船长（米）
      */
     private String shipLength;
@@ -143,6 +158,12 @@ public class BjBuildCheckBo extends BaseEntity {
     private String delFlag;
 
     /**
+     * 检查日期数组
+     */
+    @Schema(description = "检查日期数组")
+    private String [] checkDates;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -43,11 +43,21 @@ public class BjPortReportBo extends BaseEntity {
     private String reportCode;
 
     /**
+     * 进出港
+     */
+    private String inOutPort;
+
+    /**
      * 报告机构
      */
     private String reportOrganization;
 
     /**
+     * 申报来源
+     */
+    private String applySource;
+
+    /**
      * 报告类型
      */
     private String reportType;
@@ -128,24 +138,42 @@ public class BjPortReportBo extends BaseEntity {
     private String delFlag;
 
     /**
+     * 申请时间数组
+     */
+    @Schema(description = "申请时间数组")
+    private String[] declareDates;
+
+    /**
      * 开始时间搜索使用
      */
-    private String startEndDate;
+    private String startDeclareDate;
 
     /**
      * 结束时间搜索使用
      */
-    private String endEndDate;
+    private String endDeclareDate;
+
+    /**
+     * （预）到港时间数组
+     */
+    @Schema(description = "（预）到港时间数组")
+    private String[] endDates;
 
     /**
      * 开始时间搜索使用
      */
-    private String startDeclareDate;
+    private String startEndDate;
 
     /**
      * 结束时间搜索使用
      */
-    private String endDeclareDate;
+    private String endEndDate;
+
+    /**
+     * 发布时间数组
+     */
+    @Schema(description = "发布时间数组")
+    private String[] releaseDates;
 
     /**
      * 开始时间搜索使用

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

@@ -200,6 +200,12 @@ public class BjSecurityCheckBo extends BaseEntity {
     private String breakReason;
 
     /**
+     * 检查日期数组
+     */
+    @Schema(description = "检查日期数组")
+    private String [] checkDates;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -43,6 +43,11 @@ public class BjServiceCheckBo extends BaseEntity {
     private String shipRegisterNumber;
 
     /**
+     * 船舶类型
+     */
+    private String shipType;
+
+    /**
      * 船籍港
      */
     private String regportName;
@@ -123,6 +128,12 @@ public class BjServiceCheckBo extends BaseEntity {
     private String delFlag;
 
     /**
+     * 检查日期数组
+     */
+    @Schema(description = "检查日期数组")
+    private String [] checkDates;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -49,6 +49,11 @@ public class BjShipsRegistrationBo extends BaseEntity {
     private String shipFirstregNo;
 
     /**
+     * 船籍港
+     */
+    private String regportName;
+
+    /**
      * 船舶所有人
      */
     private String shipOwner;
@@ -111,6 +116,12 @@ public class BjShipsRegistrationBo extends BaseEntity {
     private String breakReason;
 
     /**
+     * 注销日期数组
+     */
+    @Schema(description = "注销日期数组")
+    private String [] deletionDates;
+
+    /**
      * 开始时间搜索使用
      */
     private String startDeletionDate;

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

@@ -47,6 +47,16 @@ public class BjBuildCheckVo implements Serializable {
     private String shipCheckOrganization;
 
     /**
+     * 国际/国内
+     */
+    private String countryType;
+
+    /**
+     * 检查机构
+     */
+    private String checkOrganization;
+
+    /**
      * 检查人员
      */
     private String checkPerson;
@@ -58,11 +68,16 @@ public class BjBuildCheckVo implements Serializable {
     private Date checkDate;
 
     /**
-     * 船舶种类
+     * 船舶类型
      */
     private String shipType;
 
     /**
+     * 船舶种类
+     */
+    private String shipSort;
+
+    /**
      * 船长（米）
      */
     private String shipLength;

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

@@ -42,11 +42,21 @@ public class BjPortReportVo implements Serializable {
     private String reportCode;
 
     /**
+     * 进出港
+     */
+    private String inOutPort;
+
+    /**
      * 报告机构
      */
     private String reportOrganization;
 
     /**
+     * 申报来源
+     */
+    private String applySource;
+
+    /**
      * 报告类型
      */
     private String reportType;

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

@@ -44,6 +44,11 @@ public class BjServiceCheckVo implements Serializable {
     private String shipRegisterNumber;
 
     /**
+     * 船舶类型
+     */
+    private String shipType;
+
+    /**
      * 船籍港
      */
     private String regportName;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjAdministrativePunishServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjAdministrativePunish;
-import com.ruoyi.business.domain.BjAdministrativePunish;
 import com.ruoyi.business.domain.bo.BjAdministrativePunishBo;
 import com.ruoyi.business.domain.bo.BreakBo;
 import com.ruoyi.business.domain.bo.ReportFlagBo;
@@ -50,6 +49,10 @@ public class BjAdministrativePunishServiceImpl implements IBjAdministrativePunis
      */
     @Override
     public List<BjAdministrativePunishVo> queryPageList(BjAdministrativePunishBo bo) {
+        if (bo.getDecisionDates() != null && bo.getDecisionDates().length != 0) {
+            bo.setStartDecisionDate(bo.getDecisionDates()[0]);
+            bo.setEndDecisionDate(bo.getDecisionDates()[1]);
+        }
         return baseMapper.queryAdministrativePunishList(bo);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjBuildCheckServiceImpl.java

@@ -50,6 +50,10 @@ public class BjBuildCheckServiceImpl implements IBjBuildCheckService {
      */
     @Override
     public List<BjBuildCheckVo> queryPageList(BjBuildCheckBo bo) {
+        if (bo.getCheckDates() != null && bo.getCheckDates().length != 0) {
+            bo.setStartCheckDate(bo.getCheckDates()[0]);
+            bo.setEndCheckDate(bo.getCheckDates()[1]);
+        }
         return baseMapper.queryBuildCheckList(bo);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjPortReportServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjPortReport;
-import com.ruoyi.business.domain.BjPortReport;
 import com.ruoyi.business.domain.bo.BjPortReportBo;
 import com.ruoyi.business.domain.bo.BreakBo;
 import com.ruoyi.business.domain.bo.ReportFlagBo;
@@ -50,6 +49,18 @@ public class BjPortReportServiceImpl implements IBjPortReportService {
      */
     @Override
     public List<BjPortReportVo> queryPageList(BjPortReportBo bo) {
+        if (bo.getDeclareDates() != null && bo.getDeclareDates().length != 0) {
+            bo.setStartDeclareDate(bo.getDeclareDates()[0]);
+            bo.setEndDeclareDate(bo.getDeclareDates()[1]);
+        }
+        if (bo.getEndDates() != null && bo.getEndDates().length != 0) {
+            bo.setStartEndDate(bo.getEndDates()[0]);
+            bo.setEndEndDate(bo.getEndDates()[1]);
+        }
+        if (bo.getReleaseDates() != null && bo.getReleaseDates().length != 0) {
+            bo.setStartReleaseDate(bo.getReleaseDates()[0]);
+            bo.setEndReleaseDate(bo.getReleaseDates()[1]);
+        }
         return baseMapper.queryPortReportList(bo);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjSecurityCheckServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjSecurityCheck;
-import com.ruoyi.business.domain.BjSecurityCheck;
 import com.ruoyi.business.domain.bo.BjSecurityCheckBo;
 import com.ruoyi.business.domain.bo.BreakBo;
 import com.ruoyi.business.domain.bo.ReportFlagBo;
@@ -50,6 +49,10 @@ public class BjSecurityCheckServiceImpl implements IBjSecurityCheckService {
      */
     @Override
     public List<BjSecurityCheckVo> queryPageList(BjSecurityCheckBo bo) {
+        if (bo.getCheckDates() != null && bo.getCheckDates().length != 0) {
+            bo.setStartCheckDate(bo.getCheckDates()[0]);
+            bo.setEndCheckDate(bo.getCheckDates()[1]);
+        }
         return baseMapper.querySecurityCheckList(bo);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjServiceCheckServiceImpl.java

@@ -50,6 +50,10 @@ public class BjServiceCheckServiceImpl implements IBjServiceCheckService {
      */
     @Override
     public List<BjServiceCheckVo> queryPageList(BjServiceCheckBo bo) {
+        if (bo.getCheckDates() != null && bo.getCheckDates().length != 0) {
+            bo.setStartCheckDate(bo.getCheckDates()[0]);
+            bo.setEndCheckDate(bo.getCheckDates()[1]);
+        }
         return baseMapper.queryServiceCheckList(bo);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjShipsRegistrationServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjShipsRegistration;
-import com.ruoyi.business.domain.BjShipsRegistration;
 import com.ruoyi.business.domain.bo.BjShipsRegistrationBo;
 import com.ruoyi.business.domain.bo.BreakBo;
 import com.ruoyi.business.domain.bo.ReportFlagBo;
@@ -50,6 +49,10 @@ public class BjShipsRegistrationServiceImpl implements IBjShipsRegistrationServi
      */
     @Override
     public List<BjShipsRegistrationVo> queryPageList(BjShipsRegistrationBo bo) {
+        if (bo.getDeletionDates() != null && bo.getDeletionDates().length != 0) {
+            bo.setStartDeletionDate(bo.getDeletionDates()[0]);
+            bo.setEndDeletionDate(bo.getDeletionDates()[1]);
+        }
         return baseMapper.queryShipsRegistrationList(bo);
     }
 

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

@@ -67,12 +67,39 @@
         <if test="bo.caseNo != null and bo.caseNo != ''">
             and case_no like concat('%',#{bo.caseNo},'%')
         </if>
-        <if test="bo.punishReason != null and bo.punishReason != ''">
-            and punish_reason like concat('%',#{bo.punishReason},'%')
-        </if>
         <if test="bo.punishObjName != null and bo.punishObjName != ''">
             and punish_obj_name like concat('%',#{bo.punishObjName},'%')
         </if>
+        <if test="bo.punishReason != null and bo.punishReason != ''">
+            and punish_reason = #{bo.punishReason}
+        </if>
+        <if test="bo.shipNameCn != null and bo.shipNameCn != ''">
+            and ship_name_cn = #{bo.shipNameCn}
+        </if>
+        <if test="bo.processType != null">
+            and process_type = #{bo.processType}
+        </if>
+        <if test="bo.processSort != null">
+            and process_sort = #{bo.processSort}
+        </if>
+        <if test="bo.disposeOrg != null and bo.disposeOrg != ''">
+            and dispose_org = #{bo.disposeOrg}
+        </if>
+        <if test="bo.partiesType != null and bo.partiesType != ''">
+            and parties_type = #{bo.partiesType}
+        </if>
+        <if test="bo.portOfregistry != null and bo.portOfregistry != ''">
+            and port_ofregistry = #{bo.portOfregistry}
+        </if>
+        <if test="bo.shipSort != null and bo.shipSort != ''">
+            and ship_sort = #{bo.shipSort}
+        </if>
+        <if test="bo.inlandShips != null and bo.inlandShips != ''">
+            and inland_ships = #{bo.inlandShips}
+        </if>
+        <if test="bo.waterAreaType != null and bo.waterAreaType != ''">
+            and water_area_type = #{bo.waterAreaType}
+        </if>
         <if test="bo.startDecisionDate != null and bo.endDecisionDate != null">
             and declare_date between #{bo.startDecisionDate} and #{bo.endDecisionDate}
         </if>

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

@@ -54,12 +54,33 @@
                break_reason
         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_register_number like concat('%',#{bo.shipRegisterNumber},'%')
         </if>
+        <if test="bo.shipName != null and bo.shipName != ''">
+            and ship_name = #{bo.shipName}
+        </if>
+        <if test="bo.shipyard != null and bo.shipyard != ''">
+            and shipyard = #{bo.shipyard}
+        </if>
+        <if test="bo.shipType != null and bo.shipType != ''">
+            and ship_type = #{bo.shipType}
+        </if>
+        <if test="bo.countryType != null and bo.countryType != ''">
+            and country_type = #{bo.countryType}
+        </if>
+        <if test="bo.checkOrganization != null and bo.checkOrganization != ''">
+            and check_organization = #{bo.checkOrganization}
+        </if>
+        <if test="bo.checkResult != null and bo.checkResult != ''">
+            and check_result = #{bo.checkResult}
+        </if>
+        <if test="bo.shipSort != null and bo.shipSort != ''">
+            and ship_sort = #{bo.shipSort}
+        </if>
+        <if test="bo.status != null and bo.status != ''">
+            and status = #{bo.status}
+        </if>
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>

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

@@ -57,12 +57,21 @@
         <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 test="bo.inOutPort != null and bo.inOutPort != ''">
+            and in_out_port = #{bo.inOutPort}
+        </if>
+        <if test="bo.reportOrganization != null and bo.reportOrganization != ''">
+            and report_organization = #{bo.reportOrganization}
+        </if>
+        <if test="bo.applySource != null and bo.applySource != ''">
+            and apply_source = #{bo.applySource}
         </if>
         <if test="bo.startDeclareDate != null and bo.endDeclareDate != null">
             and declare_date between #{bo.startDeclareDate} and #{bo.endDeclareDate}
         </if>
+        <if test="bo.startEndDate != null and bo.endEndDate != null">
+            and end_date between #{bo.startEndDate} and #{bo.endEndDate}
+        </if>
         <if test="bo.startReleaseDate != null and bo.endReleaseDate != null">
             and release_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
         </if>

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

@@ -91,6 +91,24 @@
         <if test="bo.shipOwner != null and bo.shipOwner != ''">
             and ship_owner like concat('%',#{bo.shipOwner},'%')
         </if>
+        <if test="bo.checkType != null and bo.checkType != ''">
+            and check_type = #{bo.checkType}
+        </if>
+        <if test="bo.regportName != null and bo.regportName != ''">
+            and regport_name = #{bo.regportName}
+        </if>
+        <if test="bo.retentionFlag != null and bo.retentionFlag != ''">
+            and retention_flag = #{bo.retentionFlag}
+        </if>
+        <if test="bo.checkOrganization != null and bo.checkOrganization != ''">
+            and check_organization = #{bo.checkOrganization}
+        </if>
+        <if test="bo.illegalInformation != null and bo.illegalInformation != ''">
+            and illegal_information = #{bo.illegalInformation}
+        </if>
+        <if test="bo.handlingSuggestion != null and bo.handlingSuggestion != ''">
+            and handling_suggestion = #{bo.handlingSuggestion}
+        </if>
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>

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

@@ -52,6 +52,30 @@
         <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
             and ship_register_number like concat('%',#{bo.shipRegisterNumber},'%')
         </if>
+        <if test="bo.shipName != null and bo.shipName != ''">
+            and ship_name = #{bo.shipName}
+        </if>
+        <if test="bo.shipType != null and bo.shipType != ''">
+            and ship_type = #{bo.shipType}
+        </if>
+        <if test="bo.regportName != null and bo.regportName != ''">
+            and regport_name = #{bo.regportName}
+        </if>
+        <if test="bo.checkOrganization != null and bo.checkOrganization != ''">
+            and check_organization = #{bo.checkOrganization}
+        </if>
+        <if test="bo.checkResult != null and bo.checkResult != ''">
+            and check_result = #{bo.checkResult}
+        </if>
+        <if test="bo.beMonitorOrganization != null and bo.beMonitorOrganization != ''">
+            and be_monitor_organization = #{bo.beMonitorOrganization}
+        </if>
+        <!--<if test="bo.shipSort != null and bo.shipSort != ''">
+            and ship_sort = #{bo.shipSort}
+        </if>-->
+        <if test="bo.status != null and bo.status != ''">
+            and status = #{bo.status}
+        </if>
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>

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

@@ -9,11 +9,12 @@
         <result property="shipNameCn" column="ship_name_cn"/>
         <result property="shipNameEn" column="ship_name_en"/>
         <result property="shipFirstregNo" column="ship_firstreg_no"/>
+        <result property="regportName" column="regport_name"/>
         <result property="shipOwner" column="ship_owner"/>
         <result property="shipClassName" column="ship_class_name"/>
         <result property="deletionDate" column="deletion_date"/>
         <result property="deletionOrganization" column="deletion_organization"/>
-        <result property="deletionReason" column="deletionReason"/>
+        <result property="deletionReason" column="deletion_reason"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
         <result property="reportFlag" column="report_flag"/>
@@ -28,6 +29,7 @@
                ship_name_cn,
                ship_name_en,
                ship_firstreg_no,
+               regport_name,
                ship_owner,
                ship_class_name,
                deletion_date,
@@ -57,6 +59,18 @@
         <if test="bo.shipOwner != null and bo.shipOwner != ''">
             and ship_owner like concat('%',#{bo.shipOwner},'%')
         </if>
+        <if test="bo.regportName != null and bo.regportName != ''">
+            and regport_name = #{bo.regportName}
+        </if>
+        <if test="bo.shipClassName != null and bo.shipClassName != ''">
+            and ship_class_name = #{bo.shipClassName}
+        </if>
+        <if test="bo.deletionOrganization != null and bo.deletionOrganization != ''">
+            and deletion_organization = #{bo.deletionOrganization}
+        </if>
+        <if test="bo.deletionReason != null and bo.deletionReason != ''">
+            and deletion_reason = #{bo.deletionReason}
+        </if>
         <if test="bo.startDeletionDate != null and bo.endDeletionDate != null">
             and deletion_date between #{bo.startDeletionDate} and #{bo.endDeletionDate}
         </if>