Sākums Izpētīt Palīdzība
Pierakstīties
haikou
/
meilan-server
Vērot 2
Pievienot zvaigznīti 0
Atdalīts 0
Files Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

格式化代码

chenshudong 3 mēneši atpakaļ
vecāks
dae7484964
revīzija
8ea44d5f6e
12 mainītis faili ar 282 papildinājumiem un 248 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 0
      airport-item/src/main/java/com/sundot/airport/item/mapper/FailedMatchItemMapper.java
  2. 81 69
      airport-item/src/main/java/com/sundot/airport/item/mapper/ItemSeizureStatsMapper.java
  3. 1 0
      airport-item/src/main/java/com/sundot/airport/item/service/IFailedMatchItemService.java
  4. 57 42
      airport-item/src/main/java/com/sundot/airport/item/service/IItemSeizureStatsService.java
  5. 2 2
      airport-item/src/main/java/com/sundot/airport/item/service/ItemSeizureRecordApprovalHandler.java
  6. 7 5
      airport-item/src/main/java/com/sundot/airport/item/service/UserRankingService.java
  7. 1 0
      airport-item/src/main/java/com/sundot/airport/item/service/impl/FailedMatchItemServiceImpl.java
  8. 21 21
      airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureItemsServiceImpl.java
  9. 10 10
      airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureRecordServiceImpl.java
  10. 16 16
      airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureStatsServiceImpl.java
  11. 1 1
      airport-item/src/main/resources/mapper/item/ItemSeizureItemsMapper.xml
  12. 84 82
      airport-item/src/main/resources/mapper/item/ItemSeizureStatsMapper.xml

+ 1 - 0
airport-item/src/main/java/com/sundot/airport/item/mapper/FailedMatchItemMapper.java
Parādīt failu 

@@ -1,6 +1,7 @@
1 1 
 package com.sundot.airport.item.mapper;
2 2
3 3 
 import java.util.List;
4 
+
4 5 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 6 
 import com.sundot.airport.item.domain.FailedMatchItem;
6 7

+ 81 - 69
airport-item/src/main/java/com/sundot/airport/item/mapper/ItemSeizureStatsMapper.java
Parādīt failu 

@@ -11,136 +11,148 @@ import java.util.Date;
11 11 
  */
12 12 
 @Mapper
13 13 
 public interface ItemSeizureStatsMapper {
14 
-
14 
+
15 15 
     /**
16 16 
      * 查询个人有效查获数量
17 
-     * @param userId 用户ID
17 
+     *
18 
+     * @param userId    用户ID
18 19 
      * @param startTime 开始时间
19 
-     * @param endTime 结束时间
20 
+     * @param endTime   结束时间
20 21 
      * @return 有效查获数量
21 22 
      */
22 
-    Long selectPersonalEffectiveSeizureCount(@Param("userId") Long userId,
23 
-                                           @Param("startTime") Date startTime,
24 
-                                           @Param("endTime") Date endTime);
25 
-
23 
+    Long selectPersonalEffectiveSeizureCount(@Param("userId") Long userId,
24 
+                                             @Param("startTime") Date startTime,
25 
+                                             @Param("endTime") Date endTime);
26 
+
26 27 
     /**
27 28 
      * 查询个人故意隐匿查获数量
28 
-     * @param userId 用户ID
29 
+     *
30 
+     * @param userId    用户ID
29 31 
      * @param startTime 开始时间
30 
-     * @param endTime 结束时间
32 
+     * @param endTime   结束时间
31 33 
      * @return 故意隐匿查获数量
32 34 
      */
33 
-    Long selectPersonalWillfulConcealmentCount(@Param("userId") Long userId,
34 
-                                              @Param("startTime") Date startTime,
35 
-                                              @Param("endTime") Date endTime);
36 
-
35 
+    Long selectPersonalWillfulConcealmentCount(@Param("userId") Long userId,
36 
+                                               @Param("startTime") Date startTime,
37 
+                                               @Param("endTime") Date endTime);
38 
+
37 39 
     /**
38 40 
      * 查询个人移交公安查获数量
39 
-     * @param userId 用户ID
41 
+     *
42 
+     * @param userId    用户ID
40 43 
      * @param startTime 开始时间
41 
-     * @param endTime 结束时间
44 
+     * @param endTime   结束时间
42 45 
      * @return 移交公安查获数量
43 46 
      */
44 
-    Long selectPersonalReferToPoliceCount(@Param("userId") Long userId,
45 
-                                         @Param("startTime") Date startTime,
46 
-                                         @Param("endTime") Date endTime);
47 
-
47 
+    Long selectPersonalReferToPoliceCount(@Param("userId") Long userId,
48 
+                                          @Param("startTime") Date startTime,
49 
+                                          @Param("endTime") Date endTime);
50 
+
48 51 
     /**
49 52 
      * 查询班组有效查获总量
50 
-     * @param teamId 班组ID
53 
+     *
54 
+     * @param teamId    班组ID
51 55 
      * @param startTime 开始时间
52 
-     * @param endTime 结束时间
56 
+     * @param endTime   结束时间
53 57 
      * @return 有效查获总量统计
54 58 
      */
55 
-    SeizureStats selectTeamEffectiveSeizureCount(@Param("teamId") Long teamId,
56 
-                                                @Param("startTime") Date startTime,
57 
-                                                @Param("endTime") Date endTime);
58 
-
59 
+    SeizureStats selectTeamEffectiveSeizureCount(@Param("teamId") Long teamId,
60 
+                                                 @Param("startTime") Date startTime,
61 
+                                                 @Param("endTime") Date endTime);
62 
+
59 63 
     /**
60 64 
      * 查询班组故意隐匿查获总量
61 
-     * @param teamId 班组ID
65 
+     *
66 
+     * @param teamId    班组ID
62 67 
      * @param startTime 开始时间
63 
-     * @param endTime 结束时间
68 
+     * @param endTime   结束时间
64 69 
      * @return 故意隐匿查获总量统计
65 70 
      */
66 
-    SeizureStats selectTeamWillfulConcealmentCount(@Param("teamId") Long teamId,
67 
-                                                  @Param("startTime") Date startTime,
68 
-                                                  @Param("endTime") Date endTime);
69 
-
71 
+    SeizureStats selectTeamWillfulConcealmentCount(@Param("teamId") Long teamId,
72 
+                                                   @Param("startTime") Date startTime,
73 
+                                                   @Param("endTime") Date endTime);
74 
+
70 75 
     /**
71 76 
      * 查询班组移交公安查获总量
72 
-     * @param teamId 班组ID
77 
+     *
78 
+     * @param teamId    班组ID
73 79 
      * @param startTime 开始时间
74 
-     * @param endTime 结束时间
80 
+     * @param endTime   结束时间
75 81 
      * @return 移交公安查获总量统计
76 82 
      */
77 
-    SeizureStats selectTeamReferToPoliceCount(@Param("teamId") Long teamId,
78 
-                                             @Param("startTime") Date startTime,
79 
-                                             @Param("endTime") Date endTime);
80 
-
83 
+    SeizureStats selectTeamReferToPoliceCount(@Param("teamId") Long teamId,
84 
+                                              @Param("startTime") Date startTime,
85 
+                                              @Param("endTime") Date endTime);
86 
+
81 87 
     /**
82 88 
      * 查询科室有效查获总量
89 
+     *
83 90 
      * @param departmentId 科室ID
84 
-     * @param startTime 开始时间
85 
-     * @param endTime 结束时间
91 
+     * @param startTime    开始时间
92 
+     * @param endTime      结束时间
86 93 
      * @return 有效查获总量统计
87 94 
      */
88 
-    SeizureStats selectDepartmentEffectiveSeizureCount(@Param("departmentId") Long departmentId,
89 
-                                                      @Param("startTime") Date startTime,
90 
-                                                      @Param("endTime") Date endTime);
91 
-
95 
+    SeizureStats selectDepartmentEffectiveSeizureCount(@Param("departmentId") Long departmentId,
96 
+                                                       @Param("startTime") Date startTime,
97 
+                                                       @Param("endTime") Date endTime);
98 
+
92 99 
     /**
93 100 
      * 查询科室故意隐匿查获总量
101 
+     *
94 102 
      * @param departmentId 科室ID
95 
-     * @param startTime 开始时间
96 
-     * @param endTime 结束时间
103 
+     * @param startTime    开始时间
104 
+     * @param endTime      结束时间
97 105 
      * @return 故意隐匿查获总量统计
98 106 
      */
99 
-    SeizureStats selectDepartmentWillfulConcealmentCount(@Param("departmentId") Long departmentId,
100 
-                                                        @Param("startTime") Date startTime,
101 
-                                                        @Param("endTime") Date endTime);
102 
-
107 
+    SeizureStats selectDepartmentWillfulConcealmentCount(@Param("departmentId") Long departmentId,
108 
+                                                         @Param("startTime") Date startTime,
109 
+                                                         @Param("endTime") Date endTime);
110 
+
103 111 
     /**
104 112 
      * 查询科室移交公安查获总量
113 
+     *
105 114 
      * @param departmentId 科室ID
106 
-     * @param startTime 开始时间
107 
-     * @param endTime 结束时间
115 
+     * @param startTime    开始时间
116 
+     * @param endTime      结束时间
108 117 
      * @return 移交公安查获总量统计
109 118 
      */
110 
-    SeizureStats selectDepartmentReferToPoliceCount(@Param("departmentId") Long departmentId,
111 
-                                                   @Param("startTime") Date startTime,
112 
-                                                   @Param("endTime") Date endTime);
113 
-
119 
+    SeizureStats selectDepartmentReferToPoliceCount(@Param("departmentId") Long departmentId,
120 
+                                                    @Param("startTime") Date startTime,
121 
+                                                    @Param("endTime") Date endTime);
122 
+
114 123 
     /**
115 124 
      * 查询机构站有效查获总量
125 
+     *
116 126 
      * @param stationId 机构站ID
117 127 
      * @param startTime 开始时间
118 
-     * @param endTime 结束时间
128 
+     * @param endTime   结束时间
119 129 
      * @return 有效查获总量统计
120 130 
      */
121 
-    SeizureStats selectStationEffectiveSeizureCount(@Param("stationId") Long stationId,
122 
-                                                   @Param("startTime") Date startTime,
123 
-                                                   @Param("endTime") Date endTime);
124 
-
131 
+    SeizureStats selectStationEffectiveSeizureCount(@Param("stationId") Long stationId,
132 
+                                                    @Param("startTime") Date startTime,
133 
+                                                    @Param("endTime") Date endTime);
134 
+
125 135 
     /**
126 136 
      * 查询机构站故意隐匿查获总量
137 
+     *
127 138 
      * @param stationId 机构站ID
128 139 
      * @param startTime 开始时间
129 
-     * @param endTime 结束时间
140 
+     * @param endTime   结束时间
130 141 
      * @return 故意隐匿查获总量统计
131 142 
      */
132 
-    SeizureStats selectStationWillfulConcealmentCount(@Param("stationId") Long stationId,
133 
-                                                     @Param("startTime") Date startTime,
134 
-                                                     @Param("endTime") Date endTime);
135 
-
143 
+    SeizureStats selectStationWillfulConcealmentCount(@Param("stationId") Long stationId,
144 
+                                                      @Param("startTime") Date startTime,
145 
+                                                      @Param("endTime") Date endTime);
146 
+
136 147 
     /**
137 148 
      * 查询机构站移交公安查获总量
149 
+     *
138 150 
      * @param stationId 机构站ID
139 151 
      * @param startTime 开始时间
140 
-     * @param endTime 结束时间
152 
+     * @param endTime   结束时间
141 153 
      * @return 移交公安查获总量统计
142 154 
      */
143 
-    SeizureStats selectStationReferToPoliceCount(@Param("stationId") Long stationId,
144 
-                                                @Param("startTime") Date startTime,
145 
-                                                @Param("endTime") Date endTime);
155 
+    SeizureStats selectStationReferToPoliceCount(@Param("stationId") Long stationId,
156 
+                                                 @Param("startTime") Date startTime,
157 
+                                                 @Param("endTime") Date endTime);
146 158 
 }

+ 1 - 0
airport-item/src/main/java/com/sundot/airport/item/service/IFailedMatchItemService.java
Parādīt failu 

@@ -1,6 +1,7 @@
1 1 
 package com.sundot.airport.item.service;
2 2
3 3 
 import java.util.List;
4 
+
4 5 
 import com.baomidou.mybatisplus.extension.service.IService;
5 6 
 import com.sundot.airport.item.domain.FailedMatchItem;
6 7

+ 57 - 42
airport-item/src/main/java/com/sundot/airport/item/service/IItemSeizureStatsService.java
Parādīt failu 

@@ -8,138 +8,153 @@ import java.util.Date;
8 8 
  * 查获物统计服务接口
9 9 
  */
10 10 
 public interface IItemSeizureStatsService {
11 
-
11 
+
12 12 
     /**
13 13 
      * 查询个人有效查获数量
14 
-     * @param userId 用户ID
14 
+     *
15 
+     * @param userId    用户ID
15 16 
      * @param startTime 开始时间
16 
-     * @param endTime 结束时间
17 
+     * @param endTime   结束时间
17 18 
      * @return 有效查获数量
18 19 
      */
19 20 
     Long getPersonalEffectiveSeizureCount(Long userId, Date startTime, Date endTime);
20 
-
21 
+
21 22 
     /**
22 23 
      * 查询个人故意隐匿查获数量
23 
-     * @param userId 用户ID
24 
+     *
25 
+     * @param userId    用户ID
24 26 
      * @param startTime 开始时间
25 
-     * @param endTime 结束时间
27 
+     * @param endTime   结束时间
26 28 
      * @return 故意隐匿查获数量
27 29 
      */
28 30 
     Long getPersonalWillfulConcealmentCount(Long userId, Date startTime, Date endTime);
29 
-
31 
+
30 32 
     /**
31 33 
      * 查询个人移交公安查获数量
32 
-     * @param userId 用户ID
34 
+     *
35 
+     * @param userId    用户ID
33 36 
      * @param startTime 开始时间
34 
-     * @param endTime 结束时间
37 
+     * @param endTime   结束时间
35 38 
      * @return 移交公安查获数量
36 39 
      */
37 40 
     Long getPersonalReferToPoliceCount(Long userId, Date startTime, Date endTime);
38 
-
41 
+
39 42 
     /**
40 43 
      * 查询组织有效查获总量
41 
-     * @param deptId 部门ID
44 
+     *
45 
+     * @param deptId    部门ID
42 46 
      * @param startTime 开始时间
43 
-     * @param endTime 结束时间
47 
+     * @param endTime   结束时间
44 48 
      * @return 有效查获总量统计
45 49 
      */
46 50 
     SeizureStats getOrgEffectiveSeizureCount(Long deptId, Date startTime, Date endTime);
47 
-
51 
+
48 52 
     /**
49 53 
      * 查询班组有效查获总量
50 
-     * @param teamId 班组ID
54 
+     *
55 
+     * @param teamId    班组ID
51 56 
      * @param startTime 开始时间
52 
-     * @param endTime 结束时间
57 
+     * @param endTime   结束时间
53 58 
      * @return 有效查获总量统计
54 59 
      */
55 60 
     SeizureStats getTeamEffectiveSeizureCount(Long teamId, Date startTime, Date endTime);
56 
-
61 
+
57 62 
     /**
58 63 
      * 查询科室有效查获总量
64 
+     *
59 65 
      * @param departmentId 科室ID
60 
-     * @param startTime 开始时间
61 
-     * @param endTime 结束时间
66 
+     * @param startTime    开始时间
67 
+     * @param endTime      结束时间
62 68 
      * @return 有效查获总量统计
63 69 
      */
64 70 
     SeizureStats getDepartmentEffectiveSeizureCount(Long departmentId, Date startTime, Date endTime);
65 
-
71 
+
66 72 
     /**
67 73 
      * 查询站点有效查获总量
74 
+     *
68 75 
      * @param stationId 站点ID
69 76 
      * @param startTime 开始时间
70 
-     * @param endTime 结束时间
77 
+     * @param endTime   结束时间
71 78 
      * @return 有效查获总量统计
72 79 
      */
73 80 
     SeizureStats getStationEffectiveSeizureCount(Long stationId, Date startTime, Date endTime);
74 
-
81 
+
75 82 
     /**
76 83 
      * 查询组织故意隐匿查获总量
77 
-     * @param deptId 部门ID
84 
+     *
85 
+     * @param deptId    部门ID
78 86 
      * @param startTime 开始时间
79 
-     * @param endTime 结束时间
87 
+     * @param endTime   结束时间
80 88 
      * @return 故意隐匿查获总量统计
81 89 
      */
82 90 
     SeizureStats getOrgWillfulConcealmentCount(Long deptId, Date startTime, Date endTime);
83 
-
91 
+
84 92 
     /**
85 93 
      * 查询班组故意隐匿查获总量
86 
-     * @param teamId 班组ID
94 
+     *
95 
+     * @param teamId    班组ID
87 96 
      * @param startTime 开始时间
88 
-     * @param endTime 结束时间
97 
+     * @param endTime   结束时间
89 98 
      * @return 故意隐匿查获总量统计
90 99 
      */
91 100 
     SeizureStats getTeamWillfulConcealmentCount(Long teamId, Date startTime, Date endTime);
92 
-
101 
+
93 102 
     /**
94 103 
      * 查询科室故意隐匿查获总量
104 
+     *
95 105 
      * @param departmentId 科室ID
96 
-     * @param startTime 开始时间
97 
-     * @param endTime 结束时间
106 
+     * @param startTime    开始时间
107 
+     * @param endTime      结束时间
98 108 
      * @return 故意隐匿查获总量统计
99 109 
      */
100 110 
     SeizureStats getDepartmentWillfulConcealmentCount(Long departmentId, Date startTime, Date endTime);
101 
-
111 
+
102 112 
     /**
103 113 
      * 查询站点故意隐匿查获总量
114 
+     *
104 115 
      * @param stationId 站点ID
105 116 
      * @param startTime 开始时间
106 
-     * @param endTime 结束时间
117 
+     * @param endTime   结束时间
107 118 
      * @return 故意隐匿查获总量统计
108 119 
      */
109 120 
     SeizureStats getStationWillfulConcealmentCount(Long stationId, Date startTime, Date endTime);
110 
-
121 
+
111 122 
     /**
112 123 
      * 查询组织移交公安查获总量
113 
-     * @param deptId 部门ID
124 
+     *
125 
+     * @param deptId    部门ID
114 126 
      * @param startTime 开始时间
115 
-     * @param endTime 结束时间
127 
+     * @param endTime   结束时间
116 128 
      * @return 移交公安查获总量统计
117 129 
      */
118 130 
     SeizureStats getOrgReferToPoliceCount(Long deptId, Date startTime, Date endTime);
119 
-
131 
+
120 132 
     /**
121 133 
      * 查询班组移交公安查获总量
122 
-     * @param teamId 班组ID
134 
+     *
135 
+     * @param teamId    班组ID
123 136 
      * @param startTime 开始时间
124 
-     * @param endTime 结束时间
137 
+     * @param endTime   结束时间
125 138 
      * @return 移交公安查获总量统计
126 139 
      */
127 140 
     SeizureStats getTeamReferToPoliceCount(Long teamId, Date startTime, Date endTime);
128 
-
141 
+
129 142 
     /**
130 143 
      * 查询科室移交公安查获总量
144 
+     *
131 145 
      * @param departmentId 科室ID
132 
-     * @param startTime 开始时间
133 
-     * @param endTime 结束时间
146 
+     * @param startTime    开始时间
147 
+     * @param endTime      结束时间
134 148 
      * @return 移交公安查获总量统计
135 149 
      */
136 150 
     SeizureStats getDepartmentReferToPoliceCount(Long departmentId, Date startTime, Date endTime);
137 
-
151 
+
138 152 
     /**
139 153 
      * 查询站点移交公安查获总量
154 
+     *
140 155 
      * @param stationId 站点ID
141 156 
      * @param startTime 开始时间
142 
-     * @param endTime 结束时间
157 
+     * @param endTime   结束时间
143 158 
      * @return 移交公安查获总量统计
144 159 
      */
145 160 
     SeizureStats getStationReferToPoliceCount(Long stationId, Date startTime, Date endTime);

+ 2 - 2
airport-item/src/main/java/com/sundot/airport/item/service/ItemSeizureRecordApprovalHandler.java
Parādīt failu 

@@ -27,9 +27,9 @@ public class ItemSeizureRecordApprovalHandler implements BusinessApprovalHandler
27 27 
     @Override
28 28 
     public void handleApproved(ApprovalInstance instance) {
29 29 
         log.info("查获上报审批完成 {}", instance);
30 
-        if("COMPLETED".equals(instance.getStatus())){
30 
+        if ("COMPLETED".equals(instance.getStatus())) {
31 31 
             itemSeizureRecordService.lambdaUpdate().set(ItemSeizureRecord::getProcessStatus, ProcessStatusEnum.ARCHIVED.getCode()).eq(ItemSeizureRecord::getId, instance.getBusinessId()).update();
32 
-        }else {
32 
+        } else {
33 33 
             itemSeizureRecordService.lambdaUpdate().set(ItemSeizureRecord::getProcessStatus, ProcessStatusEnum.AUDITING.getCode()).eq(ItemSeizureRecord::getId, instance.getBusinessId()).update();
34 34 
         }
35 35

+ 7 - 5
airport-item/src/main/java/com/sundot/airport/item/service/UserRankingService.java
Parādīt failu 

@@ -14,26 +14,28 @@ import java.util.Map;
14 14 
  * 用户排名服务接口
15 15 
  */
16 16 
 public interface UserRankingService {
17 
-
17 
+
18 18 
     /**
19 19 
      * 获取用户在指定层级的详细排名信息
20 
-     *
21 
-     * @param dto 查询参数
20 
+     *
21 
+     * @param dto   查询参数
22 22 
      * @param level 层级类型：station(全站), department(科室), team(班组)
23 23 
      * @return 用户在该层级的详细排名信息
24 24 
      */
25 25 
     ItemLargeScreenCommonDto getUserRankingByLevel(BaseLargeScreenQueryParamDto dto, String level);
26 26
27 27 
     /**
28 
-     *  计算站级查获统计
28 
+     * 计算站级查获统计
29 
+     *
29 30 
      * @param params
30 31 
      * @return
31 32 
      */
32 33 
     List<ItemLargeScreenStatsDto> calculateStationItemSeizure(IndicatorCalculateParams params);
33 34
34 
-
35 
+
35 36 
     /**
36 37 
      * 获取按天统计的查获趋势数据
38 
+     *
37 39 
      * @param queryDto 查询参数
38 40 
      * @return 按天统计的查获趋势数据
39 41 
      */

+ 1 - 0
airport-item/src/main/java/com/sundot/airport/item/service/impl/FailedMatchItemServiceImpl.java
Parādīt failu 

@@ -1,6 +1,7 @@
1 1 
 package com.sundot.airport.item.service.impl;
2 2
3 3 
 import java.util.List;
4 
+
4 5 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 6 
 import com.sundot.airport.common.utils.DateUtils;
6 7 
 import org.springframework.beans.factory.annotation.Autowired;

+ 21 - 21
airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureItemsServiceImpl.java
Parādīt failu 

@@ -63,10 +63,10 @@ public class ItemSeizureItemsServiceImpl extends ServiceImpl<ItemSeizureItemsMap
63 63 
     @Override
64 64 
     public List<ItemSeizureItems> selectItemSeizureItemsList(ItemSeizureItems itemSeizureItems) {
65 65 
         List<ItemSeizureItems> result = itemSeizureItemsMapper.selectItemSeizureItemsList(itemSeizureItems);
66 
-        if(!CollectionUtils.isEmpty(result)){
66 
+        if (!CollectionUtils.isEmpty(result)) {
67 67 
             for (ItemSeizureItems itemSeizureItem : result) {
68 68 
                 String itemType = baseSeizeItemMapper.getItemTypeByName(itemSeizureItem.getItemName());
69 
-                if(StringUtils.isNotEmpty(itemType)){
69 
+                if (StringUtils.isNotEmpty(itemType)) {
70 70 
                     itemSeizureItem.setCategoryNameOne(itemType);
71 71 
                 }
72 72 
             }
 
@@ -161,25 +161,25 @@ public class ItemSeizureItemsServiceImpl extends ServiceImpl<ItemSeizureItemsMap
161 161 
      */
162 162 
     @Override
163 163 
     public List<ItemSeizureDto> selectByConditions(ItemSeizureParam itemSeizureParam) {
164 
-         List<ItemSeizureDto> itemSeizureParams = itemSeizureItemsMapper.selectByConditions(itemSeizureParam);
165 
-         if(!CollectionUtils.isEmpty(itemSeizureParams)){
166 
-             for(ItemSeizureDto  itemSeizureDto : itemSeizureParams){
167 
-                 if(itemSeizureDto.getCheckMethod().equals("AUDIO")){
168 
-                     itemSeizureDto.setCategoryNameTwo(itemSeizureDto.getItemName());
169 
-                     itemSeizureDto.setRegionalName(itemSeizureDto.getTerminlName()+"/"+itemSeizureDto.getRegionalName()+"/"+itemSeizureDto.getAttendanceStationName());
170 
-                     SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
171 
-                     if(Objects.nonNull(sysUser)){
172 
-                         itemSeizureDto.setInspectUserName(sysUser.getNickName());
173 
-                     }
174 
-                 }else{
175 
-                     SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
176 
-                     if(Objects.nonNull(sysUser)){
177 
-                         itemSeizureDto.setInspectUserName(sysUser.getNickName());
178 
-                     }
179 
-                 }
180 
-             }
181 
-             return itemSeizureParams;
182 
-         }
164 
+        List<ItemSeizureDto> itemSeizureParams = itemSeizureItemsMapper.selectByConditions(itemSeizureParam);
165 
+        if (!CollectionUtils.isEmpty(itemSeizureParams)) {
166 
+            for (ItemSeizureDto itemSeizureDto : itemSeizureParams) {
167 
+                if (itemSeizureDto.getCheckMethod().equals("AUDIO")) {
168 
+                    itemSeizureDto.setCategoryNameTwo(itemSeizureDto.getItemName());
169 
+                    itemSeizureDto.setRegionalName(itemSeizureDto.getTerminlName() + "/" + itemSeizureDto.getRegionalName() + "/" + itemSeizureDto.getAttendanceStationName());
170 
+                    SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
171 
+                    if (Objects.nonNull(sysUser)) {
172 
+                        itemSeizureDto.setInspectUserName(sysUser.getNickName());
173 
+                    }
174 
+                } else {
175 
+                    SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
176 
+                    if (Objects.nonNull(sysUser)) {
177 
+                        itemSeizureDto.setInspectUserName(sysUser.getNickName());
178 
+                    }
179 
+                }
180 
+            }
181 
+            return itemSeizureParams;
182 
+        }
183 183 
         return itemSeizureParams;
184 184 
     }
185 185

+ 10 - 10
airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureRecordServiceImpl.java
Parādīt failu 

@@ -43,9 +43,9 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
43 43 
     @Override
44 44 
     public ItemSeizureRecord selectItemSeizureRecordById(Long id) {
45 45 
         ItemSeizureRecord result = itemSeizureRecordMapper.selectItemSeizureRecordById(id);
46 
-        if(Objects.nonNull(result)){
46 
+        if (Objects.nonNull(result)) {
47 47 
             SysUser sysUser = sysUserService.selectUserById(result.getInspectUserId());
48 
-            if(Objects.nonNull(sysUser)){
48 
+            if (Objects.nonNull(sysUser)) {
49 49 
                 result.setInspectUserName(sysUser.getNickName());
50 50 
             }
51 51 
         }
 
@@ -78,21 +78,21 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
78 78 
     public List<ItemSeizureRecord> selectItemSeizureRecordListForExport(ItemSeizureRecordDTO itemSeizureRecord) {
79 79 
         // 先查询主表记录
80 80 
         List<ItemSeizureRecord> itemSeizureRecords = itemSeizureRecordMapper.selectItemSeizureRecordList(itemSeizureRecord);
81 
-
81 
+
82 82 
         // 如果没有主表记录，直接返回
83 83 
         if (itemSeizureRecords == null || itemSeizureRecords.isEmpty()) {
84 84 
             return itemSeizureRecords;
85 85 
         }
86 
-
86 
+
87 87 
         // 提取所有记录的ID
88 88 
         List<Long> recordIds = new ArrayList<>();
89 89 
         for (ItemSeizureRecord record : itemSeizureRecords) {
90 90 
             recordIds.add(record.getId());
91 91 
         }
92 
-
92 
+
93 93 
         // 根据记录ID列表查询所有相关的物品信息
94 94 
         List<ItemSeizureItems> itemsList = itemSeizureItemsService.selectItemSeizureItemsByRecordIds(recordIds);
95 
-
95 
+
96 96 
         // 将物品信息按记录ID分组
97 97 
         Map<Long, List<ItemSeizureItems>> itemsMap = new HashMap<>();
98 98 
         if (itemsList != null) {
 
@@ -106,13 +106,13 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
106 106 
                 }
107 107 
             }
108 108 
         }
109 
-
109 
+
110 110 
         // 为每个记录设置物品列表和检查人员名称
111 111 
         for (ItemSeizureRecord record : itemSeizureRecords) {
112 112 
             // 设置物品列表
113 113 
             List<ItemSeizureItems> recordItems = itemsMap.get(record.getId());
114 114 
             record.setItemSeizureItemsList(recordItems);
115 
-
115 
+
116 116 
             // 填充检查人员名称
117 117 
             if (Objects.isNull(record.getInspectUserName())) {
118 118 
                 SysUser sysUser = sysUserService.selectUserById(record.getInspectUserId());
 
@@ -121,7 +121,7 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
121 121 
                 }
122 122 
             }
123 123 
         }
124 
-
124 
+
125 125 
         return itemSeizureRecords;
126 126 
     }
127 127 
 
@@ -137,7 +137,7 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
137 137 
         itemSeizureRecord.setCreateTime(DateUtils.getNowDate());
138 138 
         int result = itemSeizureRecordMapper.insertItemSeizureRecord(itemSeizureRecord);
139 139 
         if (result < 0) {
140 
-          throw new RuntimeException("新增查获记录失败");
140 
+            throw new RuntimeException("新增查获记录失败");
141 141 
         }
142 142 
         if (!CollectionUtils.isEmpty(itemSeizureRecord.getItemSeizureItemsList())) {
143 143 
             itemSeizureRecord.getItemSeizureItemsList().forEach(itemSeizureItems -> {

+ 16 - 16
airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureStatsServiceImpl.java
Parādīt failu 

@@ -13,80 +13,80 @@ import java.util.Date;
13 13 
  */
14 14 
 @Service
15 15 
 public class ItemSeizureStatsServiceImpl implements IItemSeizureStatsService {
16 
-
16 
+
17 17 
     @Autowired
18 18 
     private ItemSeizureStatsMapper itemSeizureStatsMapper;
19 
-
19 
+
20 20 
     @Override
21 21 
     public Long getPersonalEffectiveSeizureCount(Long userId, Date startTime, Date endTime) {
22 22 
         return itemSeizureStatsMapper.selectPersonalEffectiveSeizureCount(userId, startTime, endTime);
23 23 
     }
24 
-
24 
+
25 25 
     @Override
26 26 
     public Long getPersonalWillfulConcealmentCount(Long userId, Date startTime, Date endTime) {
27 27 
         return itemSeizureStatsMapper.selectPersonalWillfulConcealmentCount(userId, startTime, endTime);
28 28 
     }
29 
-
29 
+
30 30 
     @Override
31 31 
     public Long getPersonalReferToPoliceCount(Long userId, Date startTime, Date endTime) {
32 32 
         return itemSeizureStatsMapper.selectPersonalReferToPoliceCount(userId, startTime, endTime);
33 33 
     }
34 
-
34 
+
35 35 
     @Override
36 36 
     public SeizureStats getOrgEffectiveSeizureCount(Long deptId, Date startTime, Date endTime) {
37 37 
         return itemSeizureStatsMapper.selectTeamEffectiveSeizureCount(deptId, startTime, endTime);
38 38 
     }
39 
-
39 
+
40 40 
     @Override
41 41 
     public SeizureStats getTeamEffectiveSeizureCount(Long teamId, Date startTime, Date endTime) {
42 42 
         return itemSeizureStatsMapper.selectTeamEffectiveSeizureCount(teamId, startTime, endTime);
43 43 
     }
44 
-
44 
+
45 45 
     @Override
46 46 
     public SeizureStats getDepartmentEffectiveSeizureCount(Long departmentId, Date startTime, Date endTime) {
47 47 
         return itemSeizureStatsMapper.selectDepartmentEffectiveSeizureCount(departmentId, startTime, endTime);
48 48 
     }
49 
-
49 
+
50 50 
     @Override
51 51 
     public SeizureStats getStationEffectiveSeizureCount(Long stationId, Date startTime, Date endTime) {
52 52 
         return itemSeizureStatsMapper.selectStationEffectiveSeizureCount(stationId, startTime, endTime);
53 53 
     }
54 
-
54 
+
55 55 
     @Override
56 56 
     public SeizureStats getOrgWillfulConcealmentCount(Long deptId, Date startTime, Date endTime) {
57 57 
         return itemSeizureStatsMapper.selectTeamWillfulConcealmentCount(deptId, startTime, endTime);
58 58 
     }
59 
-
59 
+
60 60 
     @Override
61 61 
     public SeizureStats getTeamWillfulConcealmentCount(Long teamId, Date startTime, Date endTime) {
62 62 
         return itemSeizureStatsMapper.selectTeamWillfulConcealmentCount(teamId, startTime, endTime);
63 63 
     }
64 
-
64 
+
65 65 
     @Override
66 66 
     public SeizureStats getDepartmentWillfulConcealmentCount(Long departmentId, Date startTime, Date endTime) {
67 67 
         return itemSeizureStatsMapper.selectDepartmentWillfulConcealmentCount(departmentId, startTime, endTime);
68 68 
     }
69 
-
69 
+
70 70 
     @Override
71 71 
     public SeizureStats getStationWillfulConcealmentCount(Long stationId, Date startTime, Date endTime) {
72 72 
         return itemSeizureStatsMapper.selectStationWillfulConcealmentCount(stationId, startTime, endTime);
73 73 
     }
74 
-
74 
+
75 75 
     @Override
76 76 
     public SeizureStats getOrgReferToPoliceCount(Long deptId, Date startTime, Date endTime) {
77 77 
         return itemSeizureStatsMapper.selectTeamReferToPoliceCount(deptId, startTime, endTime);
78 78 
     }
79 
-
79 
+
80 80 
     @Override
81 81 
     public SeizureStats getTeamReferToPoliceCount(Long teamId, Date startTime, Date endTime) {
82 82 
         return itemSeizureStatsMapper.selectTeamReferToPoliceCount(teamId, startTime, endTime);
83 83 
     }
84 
-
84 
+
85 85 
     @Override
86 86 
     public SeizureStats getDepartmentReferToPoliceCount(Long departmentId, Date startTime, Date endTime) {
87 87 
         return itemSeizureStatsMapper.selectDepartmentReferToPoliceCount(departmentId, startTime, endTime);
88 88 
     }
89 
-
89 
+
90 90 
     @Override
91 91 
     public SeizureStats getStationReferToPoliceCount(Long stationId, Date startTime, Date endTime) {
92 92 
         return itemSeizureStatsMapper.selectStationReferToPoliceCount(stationId, startTime, endTime);

+ 1 - 1
airport-item/src/main/resources/mapper/item/ItemSeizureItemsMapper.xml
Parādīt failu 

@@ -126,7 +126,7 @@
126 126 
         where id = #{id}
127 127 
     </select>
128 128
129 
-    <select id="selectItemSeizureItemsByRecordIds"  parameterType="java.util.List" resultMap="ItemSeizureItemsResult">
129 
+    <select id="selectItemSeizureItemsByRecordIds" parameterType="java.util.List" resultMap="ItemSeizureItemsResult">
130 130 
         <include refid="selectItemSeizureItemsVo"/>
131 131 
         WHERE record_id IN
132 132 
         <foreach item="recordId" collection="recordIds" open="(" separator="," close=")">

+ 84 - 82
airport-item/src/main/resources/mapper/item/ItemSeizureStatsMapper.xml
Parādīt failu 

@@ -8,217 +8,219 @@
8 8 
     <select id="selectPersonalEffectiveSeizureCount" resultType="java.lang.Long">
9 9 
         SELECT IFNULL(SUM(isi.quantity), 0)
10 10 
         FROM item_seizure_record isr
11 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
11 
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
12 12 
         WHERE isr.inspect_user_id = #{userId}
13 13 
           AND isr.seizure_time >= #{startTime}
14 14 
           AND isr.seizure_time &lt;= #{endTime}
15 
-          AND isr.process_status = '3'  -- 已归档状态
15 
+          AND isr.process_status = '3' -- 已归档状态
16 16 
     </select>
17 17
18 18 
     <!-- 个人故意隐匿查获数量 -->
19 19 
     <select id="selectPersonalWillfulConcealmentCount" resultType="java.lang.Long">
20 20 
         SELECT IFNULL(SUM(isi.quantity), 0)
21 21 
         FROM item_seizure_record isr
22 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
22 
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
23 23 
         WHERE isr.inspect_user_id = #{userId}
24 24 
           AND isr.seizure_time >= #{startTime}
25 25 
           AND isr.seizure_time &lt;= #{endTime}
26 26 
           AND isi.is_active_concealment = 1
27 
-          AND isr.process_status = '3'  -- 已归档状态
27 
+          AND isr.process_status = '3' -- 已归档状态
28 28 
     </select>
29 29
30 30 
     <!-- 个人移交公安查获数量 -->
31 31 
     <select id="selectPersonalReferToPoliceCount" resultType="java.lang.Long">
32 32 
         SELECT IFNULL(SUM(isi.quantity), 0)
33 33 
         FROM item_seizure_record isr
34 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
34 
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
35 35 
         WHERE isr.inspect_user_id = #{userId}
36 36 
           AND isr.seizure_time >= #{startTime}
37 37 
           AND isr.seizure_time &lt;= #{endTime}
38 38 
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
39 
-          AND isr.process_status = '3'  -- 已归档状态
39 
+          AND isr.process_status = '3' -- 已归档状态
40 40 
     </select>
41 41
42 42 
     <!-- 组织有效查获总量 -->
43 43 
     <select id="selectOrgEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
44 
-        SELECT
45 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
46 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
44 
+        SELECT
45 
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
46 
+        COUNT(DISTINCT isr.inspect_user_id) AS count
47 47 
         FROM item_seizure_record isr
48 48 
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
49 
-        WHERE
50 
-          <choose>
49 
+        WHERE
50 
+        <choose>
51 51 
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
52 52 
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
53 53 
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
54 54 
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
55 
-          </choose>
56 
-          AND isr.seizure_time >= #{startTime}
57 
-          AND isr.seizure_time &lt;= #{endTime}
58 
-          AND isr.process_status = '3'  -- 已归档状态
55 
+        </choose>
56 
+        AND isr.seizure_time >= #{startTime}
57 
+        AND isr.seizure_time &lt;= #{endTime}
58 
+        AND isr.process_status = '3' -- 已归档状态
59 59 
     </select>
60 60
61 61 
     <!-- 组织故意隐匿查获总量 -->
62 62 
     <select id="selectOrgWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
63 
-        SELECT
64 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
65 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
63 
+        SELECT
64 
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
65 
+        COUNT(DISTINCT isr.inspect_user_id) AS count
66 66 
         FROM item_seizure_record isr
67 67 
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
68 
-        WHERE
69 
-          <choose>
68 
+        WHERE
69 
+        <choose>
70 70 
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
71 71 
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
72 72 
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
73 73 
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
74 
-          </choose>
75 
-          AND isr.seizure_time >= #{startTime}
76 
-          AND isr.seizure_time &lt;= #{endTime}
77 
-          AND isi.is_active_concealment = 1
78 
-          AND isr.process_status = '3'  -- 已归档状态
74 
+        </choose>
75 
+        AND isr.seizure_time >= #{startTime}
76 
+        AND isr.seizure_time &lt;= #{endTime}
77 
+        AND isi.is_active_concealment = 1
78 
+        AND isr.process_status = '3' -- 已归档状态
79 79 
     </select>
80 80
81 81 
     <!-- 组织移交公安查获总量 -->
82 82 
     <select id="selectOrgReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
83 
-        SELECT
84 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
85 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
83 
+        SELECT
84 
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
85 
+        COUNT(DISTINCT isr.inspect_user_id) AS count
86 86 
         FROM item_seizure_record isr
87 87 
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
88 
-        WHERE
89 
-          <choose>
88 
+        WHERE
89 
+        <choose>
90 90 
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
91 91 
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
92 92 
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
93 93 
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
94 
-          </choose>
95 
-          AND isr.seizure_time >= #{startTime}
96 
-          AND isr.seizure_time &lt;= #{endTime}
97 
-          AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
98 
-          AND isr.process_status = '3'  -- 已归档状态
94 
+        </choose>
95 
+        AND isr.seizure_time >= #{startTime}
96 
+        AND isr.seizure_time &lt;= #{endTime}
97 
+        AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
98 
+        AND isr.process_status = '3' -- 已归档状态
99 99 
     </select>
100 100
101 101 
     <!-- 组织有效查获总量 - 班组级别 -->
102 102 
     <select id="selectTeamEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
103 
-        SELECT
104 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
105 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
103 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
104 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
106 105 
         FROM item_seizure_record isr
107 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
106 
+            LEFT JOIN item_seizure_items isi
107 
+        ON isr.id = isi.record_id
108 108 
         WHERE isr.inspect_team_id = #{teamId}
109 109 
           AND isr.seizure_time >= #{startTime}
110 110 
           AND isr.seizure_time &lt;= #{endTime}
111 
-          AND isr.process_status = '3'  -- 已归档状态
111 
+          AND isr.process_status = '3' -- 已归档状态
112 112 
     </select>
113 113
114 114 
     <!-- 组织有效查获总量 - 科室级别 -->
115 
-    <select id="selectDepartmentEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
116 
-        SELECT
117 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
118 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
115 
+    <select id="selectDepartmentEffectiveSeizureCount"
116 
+            resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
117 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
118 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
119 119 
         FROM item_seizure_record isr
120 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
120 
+            LEFT JOIN item_seizure_items isi
121 
+        ON isr.id = isi.record_id
121 122 
         WHERE isr.inspect_department_id = #{departmentId}
122 123 
           AND isr.seizure_time >= #{startTime}
123 124 
           AND isr.seizure_time &lt;= #{endTime}
124 
-          AND isr.process_status = '3'  -- 已归档状态
125 
+          AND isr.process_status = '3' -- 已归档状态
125 126 
     </select>
126 127
127 128 
     <!-- 组织有效查获总量 - 站点级别 -->
128 129 
     <select id="selectStationEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
129 
-        SELECT
130 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
131 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
130 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
131 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
132 132 
         FROM item_seizure_record isr
133 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
133 
+            LEFT JOIN item_seizure_items isi
134 
+        ON isr.id = isi.record_id
134 135 
         WHERE isr.inspect_station_id = #{stationId}
135 136 
           AND isr.seizure_time >= #{startTime}
136 137 
           AND isr.seizure_time &lt;= #{endTime}
137 
-          AND isr.process_status = '3'  -- 已归档状态
138 
+          AND isr.process_status = '3' -- 已归档状态
138 139 
     </select>
139 140
140 141 
     <!-- 组织故意隐匿查获总量 - 班组级别 -->
141 142 
     <select id="selectTeamWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
142 
-        SELECT
143 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
144 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
143 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
144 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
145 145 
         FROM item_seizure_record isr
146 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
146 
+            LEFT JOIN item_seizure_items isi
147 
+        ON isr.id = isi.record_id
147 148 
         WHERE isr.inspect_team_id = #{teamId}
148 149 
           AND isr.seizure_time >= #{startTime}
149 150 
           AND isr.seizure_time &lt;= #{endTime}
150 151 
           AND isi.is_active_concealment = 1
151 
-          AND isr.process_status = '3'  -- 已归档状态
152 
+          AND isr.process_status = '3' -- 已归档状态
152 153 
     </select>
153 154
154 155 
     <!-- 组织故意隐匿查获总量 - 科室级别 -->
155 
-    <select id="selectDepartmentWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
156 
-        SELECT
157 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
158 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
156 
+    <select id="selectDepartmentWillfulConcealmentCount"
157 
+            resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
158 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
159 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
159 160 
         FROM item_seizure_record isr
160 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
161 
+            LEFT JOIN item_seizure_items isi
162 
+        ON isr.id = isi.record_id
161 163 
         WHERE isr.inspect_department_id = #{departmentId}
162 164 
           AND isr.seizure_time >= #{startTime}
163 165 
           AND isr.seizure_time &lt;= #{endTime}
164 166 
           AND isi.is_active_concealment = 1
165 
-          AND isr.process_status = '3'  -- 已归档状态
167 
+          AND isr.process_status = '3' -- 已归档状态
166 168 
     </select>
167 169
168 170 
     <!-- 组织故意隐匿查获总量 - 站点级别 -->
169 171 
     <select id="selectStationWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
170 
-        SELECT
171 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
172 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
172 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
173 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
173 174 
         FROM item_seizure_record isr
174 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
175 
+            LEFT JOIN item_seizure_items isi
176 
+        ON isr.id = isi.record_id
175 177 
         WHERE isr.inspect_station_id = #{stationId}
176 178 
           AND isr.seizure_time >= #{startTime}
177 179 
           AND isr.seizure_time &lt;= #{endTime}
178 180 
           AND isi.is_active_concealment = 1
179 
-          AND isr.process_status = '3'  -- 已归档状态
181 
+          AND isr.process_status = '3' -- 已归档状态
180 182 
     </select>
181 183
182 184 
     <!-- 组织移交公安查获总量 - 班组级别 -->
183 185 
     <select id="selectTeamReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
184 
-        SELECT
185 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
186 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
186 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
187 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
187 188 
         FROM item_seizure_record isr
188 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
189 
+            LEFT JOIN item_seizure_items isi
190 
+        ON isr.id = isi.record_id
189 191 
         WHERE isr.inspect_team_id = #{teamId}
190 192 
           AND isr.seizure_time >= #{startTime}
191 193 
           AND isr.seizure_time &lt;= #{endTime}
192 194 
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
193 
-          AND isr.process_status = '3'  -- 已归档状态
195 
+          AND isr.process_status = '3' -- 已归档状态
194 196 
     </select>
195 197
196 198 
     <!-- 组织移交公安查获总量 - 科室级别 -->
197 199 
     <select id="selectDepartmentReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
198 
-        SELECT
199 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
200 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
200 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
201 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
201 202 
         FROM item_seizure_record isr
202 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
203 
+            LEFT JOIN item_seizure_items isi
204 
+        ON isr.id = isi.record_id
203 205 
         WHERE isr.inspect_department_id = #{departmentId}
204 206 
           AND isr.seizure_time >= #{startTime}
205 207 
           AND isr.seizure_time &lt;= #{endTime}
206 208 
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
207 
-          AND isr.process_status = '3'  -- 已归档状态
209 
+          AND isr.process_status = '3' -- 已归档状态
208 210 
     </select>
209 211
210 212 
     <!-- 组织移交公安查获总量 - 站点级别 -->
211 213 
     <select id="selectStationReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
212 
-        SELECT
213 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
214 
-            COUNT(DISTINCT isr.inspect_user_id) AS count
214 
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
215 
+               COUNT(DISTINCT isr.inspect_user_id) AS count
215 216 
         FROM item_seizure_record isr
216 
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
217 
+            LEFT JOIN item_seizure_items isi
218 
+        ON isr.id = isi.record_id
217 219 
         WHERE isr.inspect_station_id = #{stationId}
218 220 
           AND isr.seizure_time >= #{startTime}
219 221 
           AND isr.seizure_time &lt;= #{endTime}
220 222 
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
221 
-          AND isr.process_status = '3'  -- 已归档状态
223 
+          AND isr.process_status = '3' -- 已归档状态
222 224 
     </select>
223 225
224 226 
 </mapper>