abai 5 天之前
父節點
當前提交
0bd47d67e7

+ 10 - 0
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjLocaleSecurityCheckBo.java

@@ -81,4 +81,14 @@ public class BjLocaleSecurityCheckBo extends BaseEntity {
      * 是否已发布  0:未发布 1:已发布
      */
     private String releaseFlag;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startCheckDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endCheckDate;
 }

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

@@ -48,7 +48,7 @@
             and shipyard like concat('%',#{bo.shipyard},'%')
         </if>
         <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
-            and ship_id like concat('%',#{bo.shipRegisterNumber},'%')
+            and ship_register_number like concat('%',#{bo.shipRegisterNumber},'%')
         </if>
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}

+ 10 - 1
ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjLocaleSecurityCheckMapper.xml

@@ -30,8 +30,17 @@
                priority,
                release_date,
                release_flag
-        from ry.bj_locale_security_check
+        from bj_locale_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_came_cn like concat('%',#{bo.shipNameCn},'%')
+        </if>
+        <if test="bo.startCheckDate != null and bo.endCheckDate != null">
+            and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}
+        </if>
         order by locale_security_check_id,
                  RANDOM()
     </select>