优化

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

@@ -94,4 +94,14 @@ public class BjAdministrativePunishBo extends BaseEntity {
      */
     private String declareDate;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startDecisionDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endDecisionDate;
+
 }

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

@@ -112,4 +112,14 @@ public class BjSecurityCheckBo extends BaseEntity {
      */
     private Date builddate;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startCheckDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endCheckDate;
+
 }

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

@@ -51,4 +51,14 @@ public class BjShipsRegistrationBo extends BaseEntity {
      */
     private String deletionReason;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startDeletionDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endDeletionDate;
+
 }

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

@@ -36,8 +36,26 @@
                register_date,
                punish_amount,
                declare_date
-        from ry.bj_administrative_punish
+        from bj_administrative_punish
         where del_flag = '0'
+        <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.shipFirstregNo != null and bo.shipFirstregNo != ''">
+            and ship_firstreg_no like concat('%',#{bo.shipFirstregNo},'%')
+        </if>
+        <if test="bo.shipOwner != null and bo.shipOwner != ''">
+            and ship_owner like concat('%',#{bo.shipOwner},'%')
+        </if>
+        <if test="bo.startDecisionDate != null and bo.endDecisionDate != null">
+            and declare_date between #{bo.startDecisionDate} and #{bo.endDecisionDate}
+        </if>
         order by case_no,
                  RANDOM()
     </select>

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

@@ -51,7 +51,7 @@
             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}
+            and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
         order by build_check_id,
                  RANDOM()

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

@@ -43,8 +43,23 @@
                datasource,
                builddate,
                create_time
-        from ry.bj_security_check
+        from bj_security_check
         where del_flag = '0'
+        <if test="bo.shipId != null and bo.shipId != ''">
+            and ship_id like concat('%',#{bo.shipId},'%')
+        </if>
+        <if test="bo.shipNameCn != null and bo.shipNameCn != ''">
+            and ship_name_cn like concat('%',#{bo.shipNameCn},'%')
+        </if>
+        <if test="bo.shipFirstregNo != null and bo.shipFirstregNo != ''">
+            and ship_firstreg_no like concat('%',#{bo.shipFirstregNo},'%')
+        </if>
+        <if test="bo.shipOwner != null and bo.shipOwner != ''">
+            and ship_owner like concat('%',#{bo.shipOwner},'%')
+        </if>
+        <!--<if test="bo.startCheckDate != null and bo.endCheckDate != null">
+            and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
+        </if>-->
         order by ship_id,
                  RANDOM()
     </select>

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

@@ -43,7 +43,7 @@
             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}
+            and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
         </if>
         order by service_check_id,
                  RANDOM()

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

@@ -18,8 +18,26 @@
                ship_firstreg_no,
                ship_owner,
                deletion_reason
-        from ry.bj_ships_registration
+        from bj_ships_registration
         where del_flag = '0'
+        <if test="bo.shipId != null and bo.shipId != ''">
+            and ship_id like concat('%',#{bo.shipId},'%')
+        </if>
+        <if test="bo.shipNameCn != null and bo.shipNameCn != ''">
+            and ship_name_cn like concat('%',#{bo.shipNameCn},'%')
+        </if>
+        <if test="bo.shipNameEn != null and bo.shipNameEn != ''">
+            and ship_name_en like concat('%',#{bo.shipNameEn},'%')
+        </if>
+        <if test="bo.shipFirstregNo != null and bo.shipFirstregNo != ''">
+            and ship_firstreg_no like concat('%',#{bo.shipFirstregNo},'%')
+        </if>
+        <if test="bo.shipOwner != null and bo.shipOwner != ''">
+            and ship_owner like concat('%',#{bo.shipOwner},'%')
+        </if>
+        <!--<if test="bo.startDeletionDate != null and bo.endDeletionDate != null">
+            and deletion_date between #{bo.startDeletionDate} and #{bo.endDeletionDate}
+        </if>-->
         order by ship_id,
                  RANDOM()
     </select>