Quellcode durchsuchen

查堵大屏--参数添加

wangxx vor 3 Tagen
Ursprung
Commit
760720b773

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

@@ -72,4 +72,10 @@ public class BlockedDashboardQueryDTO implements Serializable {
72
      */
72
      */
73
     @ApiModelProperty("航站楼ID")
73
     @ApiModelProperty("航站楼ID")
74
     private Long terminalId;
74
     private Long terminalId;
75
+
76
+    /**
77
+     * 漏检物品
78
+     */
79
+    @ApiModelProperty("漏检物品")
80
+    private String missCheckItem;
75
 }
81
 }

+ 156 - 0
airport-blocked/src/main/resources/mapper/blocked/BlockedDashboardMapper.xml

@@ -29,6 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
29
             AND review_date >= #{startTime}
29
             AND review_date >= #{startTime}
30
             AND review_date <= #{endTime}
30
             AND review_date <= #{endTime}
31
         </if>
31
         </if>
32
+        <if test="supervisorId != null">
33
+            AND supervisor_id = #{supervisorId}
34
+        </if>
35
+        <if test="teamLeaderId != null">
36
+            AND team_leader_id = #{teamLeaderId}
37
+        </if>
38
+        <if test="missCheckItem != null and missCheckItem != ''">
39
+            AND miss_check_item = #{missCheckItem}
40
+        </if>
32
     </select>
41
     </select>
33
 
42
 
34
     <!-- 查询各大队查堵总数(用于柱状图) -->
43
     <!-- 查询各大队查堵总数(用于柱状图) -->
@@ -187,6 +196,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
187
         <if test="brigadeId != null">
196
         <if test="brigadeId != null">
188
             AND brigade_id = #{brigadeId}
197
             AND brigade_id = #{brigadeId}
189
         </if>
198
         </if>
199
+        <if test="supervisorId != null">
200
+            AND supervisor_id = #{supervisorId}
201
+        </if>
202
+        <if test="teamLeaderId != null">
203
+            AND team_leader_id = #{teamLeaderId}
204
+        </if>
205
+        <if test="missCheckItem != null and missCheckItem != ''">
206
+            AND miss_check_item = #{missCheckItem}
207
+        </if>
190
         GROUP BY miss_check_item
208
         GROUP BY miss_check_item
191
         ORDER BY count DESC
209
         ORDER BY count DESC
192
     </select>
210
     </select>
@@ -233,6 +251,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
233
         <if test="brigadeId != null">
251
         <if test="brigadeId != null">
234
             AND brigade_id = #{brigadeId}
252
             AND brigade_id = #{brigadeId}
235
         </if>
253
         </if>
254
+        <if test="supervisorId != null">
255
+            AND supervisor_id = #{supervisorId}
256
+        </if>
257
+        <if test="teamLeaderId != null">
258
+            AND team_leader_id = #{teamLeaderId}
259
+        </if>
260
+        <if test="missCheckItem != null and missCheckItem != ''">
261
+            AND miss_check_item = #{missCheckItem}
262
+        </if>
236
         GROUP BY miss_check_item, discrimination_type
263
         GROUP BY miss_check_item, discrimination_type
237
         ORDER BY miss_check_item, count DESC
264
         ORDER BY miss_check_item, count DESC
238
     </select>
265
     </select>
@@ -356,6 +383,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
356
         <if test="supervisorId != null">
383
         <if test="supervisorId != null">
357
             AND supervisor_id = #{supervisorId}
384
             AND supervisor_id = #{supervisorId}
358
         </if>
385
         </if>
386
+        <if test="teamLeaderId != null">
387
+            AND team_leader_id = #{teamLeaderId}
388
+        </if>
389
+        <if test="missCheckItem != null and missCheckItem != ''">
390
+            AND miss_check_item = #{missCheckItem}
391
+        </if>
359
         GROUP BY supervisor_id, supervisor_name
392
         GROUP BY supervisor_id, supervisor_name
360
         ORDER BY totalCount DESC
393
         ORDER BY totalCount DESC
361
         LIMIT 30
394
         LIMIT 30
@@ -381,6 +414,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
381
         <if test="teamLeaderId != null">
414
         <if test="teamLeaderId != null">
382
             AND team_leader_id = #{teamLeaderId}
415
             AND team_leader_id = #{teamLeaderId}
383
         </if>
416
         </if>
417
+        <if test="supervisorId != null">
418
+            AND supervisor_id = #{supervisorId}
419
+        </if>
420
+        <if test="missCheckItem != null and missCheckItem != ''">
421
+            AND miss_check_item = #{missCheckItem}
422
+        </if>
384
         GROUP BY team_leader_id, team_leader_name
423
         GROUP BY team_leader_id, team_leader_name
385
         ORDER BY totalCount DESC
424
         ORDER BY totalCount DESC
386
         LIMIT 30
425
         LIMIT 30
@@ -406,6 +445,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
406
         <if test="reviewedUserId != null">
445
         <if test="reviewedUserId != null">
407
             AND reviewed_user_id = #{reviewedUserId}
446
             AND reviewed_user_id = #{reviewedUserId}
408
         </if>
447
         </if>
448
+        <if test="supervisorId != null">
449
+            AND supervisor_id = #{supervisorId}
450
+        </if>
451
+        <if test="teamLeaderId != null">
452
+            AND team_leader_id = #{teamLeaderId}
453
+        </if>
454
+        <if test="missCheckItem != null and missCheckItem != ''">
455
+            AND miss_check_item = #{missCheckItem}
456
+        </if>
409
         GROUP BY reviewed_user_id, reviewed_user_name
457
         GROUP BY reviewed_user_id, reviewed_user_name
410
         ORDER BY totalCount DESC
458
         ORDER BY totalCount DESC
411
         LIMIT 30
459
         LIMIT 30
@@ -431,6 +479,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
431
         <if test="itemLocation != null and itemLocation != ''">
479
         <if test="itemLocation != null and itemLocation != ''">
432
             AND item_location = #{itemLocation}
480
             AND item_location = #{itemLocation}
433
         </if>
481
         </if>
482
+        <if test="supervisorId != null">
483
+            AND supervisor_id = #{supervisorId}
484
+        </if>
485
+        <if test="teamLeaderId != null">
486
+            AND team_leader_id = #{teamLeaderId}
487
+        </if>
488
+        <if test="missCheckItem != null and missCheckItem != ''">
489
+            AND miss_check_item = #{missCheckItem}
490
+        </if>
434
         GROUP BY item_location
491
         GROUP BY item_location
435
         ORDER BY count DESC
492
         ORDER BY count DESC
436
     </select>
493
     </select>
@@ -456,6 +513,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
456
         <if test="terminalId != null">
513
         <if test="terminalId != null">
457
             AND terminal_id = #{terminalId}
514
             AND terminal_id = #{terminalId}
458
         </if>
515
         </if>
516
+        <if test="supervisorId != null">
517
+            AND supervisor_id = #{supervisorId}
518
+        </if>
519
+        <if test="teamLeaderId != null">
520
+            AND team_leader_id = #{teamLeaderId}
521
+        </if>
522
+        <if test="missCheckItem != null and missCheckItem != ''">
523
+            AND miss_check_item = #{missCheckItem}
524
+        </if>
459
         GROUP BY miss_check_reason_category
525
         GROUP BY miss_check_reason_category
460
         ORDER BY count DESC
526
         ORDER BY count DESC
461
     </select>
527
     </select>
@@ -477,6 +543,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
477
         <if test="brigadeId != null">
543
         <if test="brigadeId != null">
478
             AND brigade_id = #{brigadeId}
544
             AND brigade_id = #{brigadeId}
479
         </if>
545
         </if>
546
+        <if test="supervisorId != null">
547
+            AND supervisor_id = #{supervisorId}
548
+        </if>
549
+        <if test="teamLeaderId != null">
550
+            AND team_leader_id = #{teamLeaderId}
551
+        </if>
552
+        <if test="missCheckItem != null and missCheckItem != ''">
553
+            AND miss_check_item = #{missCheckItem}
554
+        </if>
480
         GROUP BY difficulty_level
555
         GROUP BY difficulty_level
481
         ORDER BY count DESC
556
         ORDER BY count DESC
482
     </select>
557
     </select>
@@ -504,6 +579,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
504
         <if test="terminalId != null">
579
         <if test="terminalId != null">
505
             AND bms.terminal_id = #{terminalId}
580
             AND bms.terminal_id = #{terminalId}
506
         </if>
581
         </if>
582
+        <if test="supervisorId != null">
583
+            AND bms.supervisor_id = #{supervisorId}
584
+        </if>
585
+        <if test="teamLeaderId != null">
586
+            AND bms.team_leader_id = #{teamLeaderId}
587
+        </if>
588
+        <if test="missCheckItem != null and missCheckItem != ''">
589
+            AND bms.miss_check_item = #{missCheckItem}
590
+        </if>
507
         GROUP BY u.qualification_level
591
         GROUP BY u.qualification_level
508
         ORDER BY count DESC
592
         ORDER BY count DESC
509
     </select>
593
     </select>
@@ -590,6 +674,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
590
             AND review_date &gt;= #{startTime}
674
             AND review_date &gt;= #{startTime}
591
             AND review_date &lt;= #{endTime}
675
             AND review_date &lt;= #{endTime}
592
         </if>
676
         </if>
677
+        <if test="supervisorId != null">
678
+            AND supervisor_id = #{supervisorId}
679
+        </if>
680
+        <if test="teamLeaderId != null">
681
+            AND team_leader_id = #{teamLeaderId}
682
+        </if>
683
+        <if test="missCheckItem != null and missCheckItem != ''">
684
+            AND miss_check_item = #{missCheckItem}
685
+        </if>
593
     </select>
686
     </select>
594
 
687
 
595
     <!-- 查询查堵时间段过检行李数(按大队) -->
688
     <!-- 查询查堵时间段过检行李数(按大队) -->
@@ -649,6 +742,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
649
             AND review_date &gt;= #{startTime}
742
             AND review_date &gt;= #{startTime}
650
             AND review_date &lt;= #{endTime}
743
             AND review_date &lt;= #{endTime}
651
         </if>
744
         </if>
745
+        <if test="supervisorId != null">
746
+            AND supervisor_id = #{supervisorId}
747
+        </if>
748
+        <if test="teamLeaderId != null">
749
+            AND team_leader_id = #{teamLeaderId}
750
+        </if>
751
+        <if test="missCheckItem != null and missCheckItem != ''">
752
+            AND miss_check_item = #{missCheckItem}
753
+        </if>
652
         GROUP BY supervisor_id, supervisor_name
754
         GROUP BY supervisor_id, supervisor_name
653
         ORDER BY totalCount DESC
755
         ORDER BY totalCount DESC
654
         LIMIT 10
756
         LIMIT 10
@@ -671,6 +773,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
671
             AND review_date &gt;= #{startTime}
773
             AND review_date &gt;= #{startTime}
672
             AND review_date &lt;= #{endTime}
774
             AND review_date &lt;= #{endTime}
673
         </if>
775
         </if>
776
+        <if test="supervisorId != null">
777
+            AND supervisor_id = #{supervisorId}
778
+        </if>
779
+        <if test="teamLeaderId != null">
780
+            AND team_leader_id = #{teamLeaderId}
781
+        </if>
782
+        <if test="missCheckItem != null and missCheckItem != ''">
783
+            AND miss_check_item = #{missCheckItem}
784
+        </if>
674
         GROUP BY team_leader_id, team_leader_name
785
         GROUP BY team_leader_id, team_leader_name
675
         ORDER BY totalCount DESC
786
         ORDER BY totalCount DESC
676
         LIMIT 10
787
         LIMIT 10
@@ -693,6 +804,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
693
             AND review_date &gt;= #{startTime}
804
             AND review_date &gt;= #{startTime}
694
             AND review_date &lt;= #{endTime}
805
             AND review_date &lt;= #{endTime}
695
         </if>
806
         </if>
807
+        <if test="supervisorId != null">
808
+            AND supervisor_id = #{supervisorId}
809
+        </if>
810
+        <if test="teamLeaderId != null">
811
+            AND team_leader_id = #{teamLeaderId}
812
+        </if>
813
+        <if test="missCheckItem != null and missCheckItem != ''">
814
+            AND miss_check_item = #{missCheckItem}
815
+        </if>
696
         GROUP BY reviewed_user_id, reviewed_user_name
816
         GROUP BY reviewed_user_id, reviewed_user_name
697
         ORDER BY totalCount DESC
817
         ORDER BY totalCount DESC
698
         LIMIT 10
818
         LIMIT 10
@@ -715,6 +835,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
715
             AND review_date &gt;= #{startTime}
835
             AND review_date &gt;= #{startTime}
716
             AND review_date &lt;= #{endTime}
836
             AND review_date &lt;= #{endTime}
717
         </if>
837
         </if>
838
+        <if test="supervisorId != null">
839
+            AND supervisor_id = #{supervisorId}
840
+        </if>
841
+        <if test="teamLeaderId != null">
842
+            AND team_leader_id = #{teamLeaderId}
843
+        </if>
844
+        <if test="missCheckItem != null and missCheckItem != ''">
845
+            AND miss_check_item = #{missCheckItem}
846
+        </if>
718
         GROUP BY gender
847
         GROUP BY gender
719
         ORDER BY count DESC
848
         ORDER BY count DESC
720
     </select>
849
     </select>
@@ -736,6 +865,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
736
             AND review_date &gt;= #{startTime}
865
             AND review_date &gt;= #{startTime}
737
             AND review_date &lt;= #{endTime}
866
             AND review_date &lt;= #{endTime}
738
         </if>
867
         </if>
868
+        <if test="supervisorId != null">
869
+            AND supervisor_id = #{supervisorId}
870
+        </if>
871
+        <if test="teamLeaderId != null">
872
+            AND team_leader_id = #{teamLeaderId}
873
+        </if>
874
+        <if test="missCheckItem != null and missCheckItem != ''">
875
+            AND miss_check_item = #{missCheckItem}
876
+        </if>
739
         GROUP BY certificate_level
877
         GROUP BY certificate_level
740
         ORDER BY count DESC
878
         ORDER BY count DESC
741
     </select>
879
     </select>
@@ -778,6 +916,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
778
             AND review_date &gt;= #{startTime}
916
             AND review_date &gt;= #{startTime}
779
             AND review_date &lt;= #{endTime}
917
             AND review_date &lt;= #{endTime}
780
         </if>
918
         </if>
919
+        <if test="supervisorId != null">
920
+            AND supervisor_id = #{supervisorId}
921
+        </if>
922
+        <if test="teamLeaderId != null">
923
+            AND team_leader_id = #{teamLeaderId}
924
+        </if>
925
+        <if test="missCheckItem != null and missCheckItem != ''">
926
+            AND miss_check_item = #{missCheckItem}
927
+        </if>
781
         GROUP BY supervisor_id, supervisor_name
928
         GROUP BY supervisor_id, supervisor_name
782
         ORDER BY totalCount DESC
929
         ORDER BY totalCount DESC
783
     </select>
930
     </select>
@@ -799,6 +946,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
799
             AND review_date &gt;= #{startTime}
946
             AND review_date &gt;= #{startTime}
800
             AND review_date &lt;= #{endTime}
947
             AND review_date &lt;= #{endTime}
801
         </if>
948
         </if>
949
+        <if test="supervisorId != null">
950
+            AND supervisor_id = #{supervisorId}
951
+        </if>
952
+        <if test="teamLeaderId != null">
953
+            AND team_leader_id = #{teamLeaderId}
954
+        </if>
955
+        <if test="missCheckItem != null and missCheckItem != ''">
956
+            AND miss_check_item = #{missCheckItem}
957
+        </if>
802
         GROUP BY machine_operating_years
958
         GROUP BY machine_operating_years
803
         ORDER BY count DESC
959
         ORDER BY count DESC
804
     </select>
960
     </select>