漏检统计表-补充查询筛选条件

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedMissCheckStatistics.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.sundot.airport.common.annotation.Excel;
 import com.sundot.airport.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 漏检统计对象 blocked_miss_check_statistics
@@ -178,6 +179,20 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     @ApiModelProperty("删除标志（0代表存在 1代表删除）")
     private String delFlag;
 
+    /**
+     * 查询开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 查询结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -450,6 +465,22 @@ public class BlockedMissCheckStatistics extends BaseEntity {
         return delFlag;
     }
 
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

airport-blocked/src/main/resources/mapper/blocked/BlockedMissCheckStatisticsMapper.xml

@@ -99,19 +99,50 @@
                 '%')
             </if>
             <if test="terminalId != null ">and terminal_id = #{terminalId}</if>
+            <if test="terminalName != null  and terminalName != ''">and terminal_name like
+                concat('%', #{terminalName}, '%')
+            </if>
             <if test="areaId != null ">and area_id = #{areaId}</if>
+            <if test="areaName != null  and areaName != ''">and area_name like
+                concat('%', #{areaName}, '%')
+            </if>
             <if test="channelId != null ">and channel_id = #{channelId}</if>
+            <if test="channelName != null  and channelName != ''">and channel_name like
+                concat('%', #{channelName}, '%')
+            </if>
             <if test="reviewedUserId != null ">and reviewed_user_id = #{reviewedUserId}</if>
             <if test="reviewedUserName != null  and reviewedUserName != ''">and reviewed_user_name like concat('%',
                 #{reviewedUserName}, '%')
             </if>
             <if test="reviewUserId != null ">and review_user_id = #{reviewUserId}</if>
+            <if test="reviewUserName != null  and reviewUserName != ''">and review_user_name like
+                concat('%', #{reviewUserName}, '%')
+            </if>
             <if test="reviewDate != null ">and review_date = #{reviewDate}</if>
             <if test="missCheckTime != null ">and DATE_FORMAT(miss_check_time, '%Y-%m-%d %H:%i') =
                 DATE_FORMAT(#{missCheckTime}, '%Y-%m-%d %H:%i')
             </if>
             <if test="difficultyLevel != null  and difficultyLevel != ''">and difficulty_level = #{difficultyLevel}</if>
             <if test="gender != null  and gender != ''">and gender = #{gender}</if>
+            <if test="actingSupervisorId != null ">and acting_supervisor_id = #{actingSupervisorId}</if>
+            <if test="actingSupervisorName != null  and actingSupervisorName != ''">and acting_supervisor_name like
+                concat('%', #{actingSupervisorName}, '%')
+            </if>
+            <if test="missCheckItem != null  and missCheckItem != ''">and miss_check_item like
+                concat('%', #{missCheckItem}, '%')
+            </if>
+            <if test="supervisorId != null ">and supervisor_id = #{supervisorId}</if>
+            <if test="supervisorName != null  and supervisorName != ''">and supervisor_name like
+                concat('%', #{supervisorName}, '%')
+            </if>
+            <if test="teamLeaderId != null ">and team_leader_id = #{teamLeaderId}</if>
+            <if test="teamLeaderName != null  and teamLeaderName != ''">and team_leader_name like
+                concat('%', #{teamLeaderName}, '%')
+            </if>
+            <if test="startDate != null and endDate != null">
+                and (review_date >= #{startDate}
+                and review_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+            </if>
         </where>
         order by review_date desc, miss_check_time desc
     </select>