Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-blocked/src/main/java/com/sundot/airport/blocked/dto/BlockedDashboardQueryDTO.java

@@ -72,4 +72,10 @@ public class BlockedDashboardQueryDTO implements Serializable {
      */
     @ApiModelProperty("航站楼ID")
     private Long terminalId;
+
+    /**
+     * 漏检物品
+     */
+    @ApiModelProperty("漏检物品")
+    private String missCheckItem;
 }

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

@@ -29,6 +29,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND review_date >= #{startTime}
             AND review_date <= #{endTime}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
     </select>
 
     <!-- 查询各大队查堵总数(用于柱状图) -->
@@ -187,6 +199,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY miss_check_item
         ORDER BY count DESC
     </select>
@@ -233,6 +257,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY miss_check_item, discrimination_type
         ORDER BY miss_check_item, count DESC
     </select>
@@ -353,9 +389,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="supervisorId != null">
             AND supervisor_id = #{supervisorId}
         </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY supervisor_id, supervisor_name
         ORDER BY totalCount DESC
         LIMIT 30
@@ -378,9 +423,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="teamLeaderId != null">
             AND team_leader_id = #{teamLeaderId}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY team_leader_id, team_leader_name
         ORDER BY totalCount DESC
         LIMIT 30
@@ -403,9 +457,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="reviewedUserId != null">
             AND reviewed_user_id = #{reviewedUserId}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY reviewed_user_id, reviewed_user_name
         ORDER BY totalCount DESC
         LIMIT 30
@@ -428,9 +494,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="itemLocation != null and itemLocation != ''">
             AND item_location = #{itemLocation}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY item_location
         ORDER BY count DESC
     </select>
@@ -456,6 +534,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="terminalId != null">
             AND terminal_id = #{terminalId}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY miss_check_reason_category
         ORDER BY count DESC
     </select>
@@ -477,6 +564,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY difficulty_level
         ORDER BY count DESC
     </select>
@@ -504,6 +603,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="terminalId != null">
             AND bms.terminal_id = #{terminalId}
         </if>
+        <if test="supervisorId != null">
+            AND bms.supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND bms.team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND bms.miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY u.qualification_level
         ORDER BY count DESC
     </select>
@@ -586,10 +694,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
     </select>
 
     <!-- 查询查堵时间段过检行李数(按大队) -->
@@ -645,10 +765,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY supervisor_id, supervisor_name
         ORDER BY totalCount DESC
         LIMIT 10
@@ -667,10 +799,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY team_leader_id, team_leader_name
         ORDER BY totalCount DESC
         LIMIT 10
@@ -689,10 +833,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY reviewed_user_id, reviewed_user_name
         ORDER BY totalCount DESC
         LIMIT 10
@@ -711,10 +867,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY gender
         ORDER BY count DESC
     </select>
@@ -732,10 +900,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY certificate_level
         ORDER BY count DESC
     </select>
@@ -774,10 +954,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY supervisor_id, supervisor_name
         ORDER BY totalCount DESC
     </select>
@@ -795,10 +987,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="brigadeId != null">
             AND brigade_id = #{brigadeId}
         </if>
+        <if test="terminalId != null">
+            AND terminal_id = #{terminalId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND review_date &gt;= #{startTime}
             AND review_date &lt;= #{endTime}
         </if>
+        <if test="supervisorId != null">
+            AND supervisor_id = #{supervisorId}
+        </if>
+        <if test="teamLeaderId != null">
+            AND team_leader_id = #{teamLeaderId}
+        </if>
+        <if test="missCheckItem != null and missCheckItem != ''">
+            AND miss_check_item = #{missCheckItem}
+        </if>
         GROUP BY machine_operating_years
         ORDER BY count DESC
     </select>