abai 5 days ago
parent
commit
257be02f64

+ 1 - 1
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjLocaleSecurityCheck.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bj_track_ship_company")
+@TableName("bj_locale_security_check")
 public class BjLocaleSecurityCheck extends BaseEntity {
 
     @Serial

+ 20 - 0
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipCompanyBo.java

@@ -72,4 +72,24 @@ public class BjTrackShipCompanyBo extends BaseEntity {
      */
     private String releaseFlag;
 
+    /**
+     * 开始时间搜索使用
+     */
+    private String startAddDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endAddDate;
+
+    /**
+     * 开始时间搜索使用
+     */
+    private String startReleaseDate;
+
+    /**
+     * 结束时间搜索使用
+     */
+    private String endReleaseDate;
+
 }

+ 11 - 2
ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -7,7 +7,7 @@
         <result property="trackShipCompanyId" column="track_ship_company_id"/>
         <result property="releaseUnit" column="release_unit"/>
         <result property="companyName" column="company_name"/>
-        <result property="traceReason" column="deletionReason"/>
+        <result property="traceReason" column="trace_reason"/>
         <result property="ships" column="ships"/>
         <result property="status" column="status"/>
         <result property="dateSource" column="date_source"/>
@@ -26,8 +26,17 @@
                add_date,
                release_date,
                release_flag
-        from ry.bj_track_ship_company
+        from bj_track_ship_company
         where del_flag = '0'
+        <if test="bo.companyName != null and bo.companyName != ''">
+            and company_name like concat('%',#{bo.companyName},'%')
+        </if>
+        <if test="bo.startAddDate != null and bo.endAddDate != null">
+            and add_date between #{bo.startAddDate} and #{bo.endAddDate}
+        </if>
+        <if test="bo.startReleaseDate != null and bo.endReleaseDate != null">
+            and release_date between #{bo.startReleaseDate} and #{bo.endReleaseDate}
+        </if>
         order by track_ship_company_id,
                  RANDOM()
     </select>