chenshudong месяцев назад: 4
Родитель
Сommit
ff370edf48

+ 2 - 1
airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemLargeScreenController.java

@@ -125,7 +125,8 @@ public class ItemLargeScreenController extends BaseController {
125
     }
125
     }
126
 
126
 
127
     /**
127
     /**
128
-     *  app端 查获位置分布
128
+     * app端 查获位置分布
129
+     *
129
      * @param dto 大屏查询参数
130
      * @param dto 大屏查询参数
130
      * @return 查获位置分布
131
      * @return 查获位置分布
131
      */
132
      */

+ 3 - 1
airport-item/src/main/java/com/sundot/airport/item/mapper/ItemLargeScreenMapper.java

@@ -112,13 +112,15 @@ public interface ItemLargeScreenMapper {
112
 
112
 
113
     /**
113
     /**
114
      * app端 查获位置分布
114
      * app端 查获位置分布
115
+     *
115
      * @param dto
116
      * @param dto
116
      * @return
117
      * @return
117
      */
118
      */
118
     List<ItemLargeScreenPositionAppDto> appPosition(BaseLargeScreenQueryParamDto dto);
119
     List<ItemLargeScreenPositionAppDto> appPosition(BaseLargeScreenQueryParamDto dto);
119
-    
120
+
120
     /**
121
     /**
121
      * 按天统计查获趋势数据
122
      * 按天统计查获趋势数据
123
+     *
122
      * @param dto 查询参数
124
      * @param dto 查询参数
123
      * @return 按天统计的查获数据
125
      * @return 按天统计的查获数据
124
      */
126
      */

+ 4 - 2
airport-item/src/main/java/com/sundot/airport/item/service/ItemLargeScreenService.java

@@ -55,6 +55,7 @@ public interface ItemLargeScreenService {
55
 
55
 
56
     /**
56
     /**
57
      * app端查获总数量+移交公安数量+故意隐匿数量
57
      * app端查获总数量+移交公安数量+故意隐匿数量
58
+     *
58
      * @param dto 大屏查询参数
59
      * @param dto 大屏查询参数
59
      * @return 查获总数量+移交公安数量+故意隐匿数量
60
      * @return 查获总数量+移交公安数量+故意隐匿数量
60
      */
61
      */
@@ -79,6 +80,7 @@ public interface ItemLargeScreenService {
79
 
80
 
80
     /**
81
     /**
81
      * app端查获时段分布
82
      * app端查获时段分布
83
+     *
82
      * @param dto
84
      * @param dto
83
      * @return
85
      * @return
84
      */
86
      */
@@ -93,7 +95,8 @@ public interface ItemLargeScreenService {
93
     public List<ItemLargeScreenPositionDto> position(BaseLargeScreenQueryParamDto dto);
95
     public List<ItemLargeScreenPositionDto> position(BaseLargeScreenQueryParamDto dto);
94
 
96
 
95
     /**
97
     /**
96
-     *  app端 查获位置分布
98
+     * app端 查获位置分布
99
+     *
97
      * @param dto
100
      * @param dto
98
      * @return
101
      * @return
99
      */
102
      */
@@ -108,5 +111,4 @@ public interface ItemLargeScreenService {
108
     public List<ItemLargeScreenChannelDto> channel(BaseLargeScreenQueryParamDto dto);
111
     public List<ItemLargeScreenChannelDto> channel(BaseLargeScreenQueryParamDto dto);
109
 
112
 
110
 
113
 
111
-
112
 }
114
 }

+ 9 - 6
airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -112,6 +112,7 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
112
 
112
 
113
     /**
113
     /**
114
      * app端查获总数量+移交公安数量+故意隐匿数量
114
      * app端查获总数量+移交公安数量+故意隐匿数量
115
+     *
115
      * @param dto 大屏查询参数
116
      * @param dto 大屏查询参数
116
      * @return
117
      * @return
117
      */
118
      */
@@ -143,10 +144,10 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
143
                 break;
144
                 break;
144
             case 3:
145
             case 3:
145
                 result = itemLargeScreenMapper.rankByIndividual(dto);
146
                 result = itemLargeScreenMapper.rankByIndividual(dto);
146
-                for(ItemLargeScreenCommonDto itemLargeScreenCommonDto : result){
147
-                    if(Objects.nonNull(itemLargeScreenCommonDto)){
147
+                for (ItemLargeScreenCommonDto itemLargeScreenCommonDto : result) {
148
+                    if (Objects.nonNull(itemLargeScreenCommonDto)) {
148
                         SysUser sysUser = sysUserService.selectUserById(itemLargeScreenCommonDto.getId());
149
                         SysUser sysUser = sysUserService.selectUserById(itemLargeScreenCommonDto.getId());
149
-                        if(Objects.nonNull(sysUser)){
150
+                        if (Objects.nonNull(sysUser)) {
150
                             itemLargeScreenCommonDto.setName(sysUser.getNickName());
151
                             itemLargeScreenCommonDto.setName(sysUser.getNickName());
151
                         }
152
                         }
152
                     }
153
                     }
@@ -174,8 +175,9 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
174
     }
175
     }
175
 
176
 
176
     /**
177
     /**
177
-     *  app端 查获时段分布
178
-     * @param dto  大屏查询参数
178
+     * app端 查获时段分布
179
+     *
180
+     * @param dto 大屏查询参数
179
      * @return 查获时段分布
181
      * @return 查获时段分布
180
      */
182
      */
181
     @Override
183
     @Override
@@ -240,7 +242,8 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
240
     }
242
     }
241
 
243
 
242
     /**
244
     /**
243
-     *  app端 查获位置分布
245
+     * app端 查获位置分布
246
+     *
244
      * @param dto
247
      * @param dto
245
      * @return
248
      * @return
246
      */
249
      */

+ 100 - 98
airport-item/src/main/resources/mapper/item/ItemLargeScreenMapper.xml

@@ -9,7 +9,7 @@
9
         select ifnull(sum(isi.quantity), 0) totalSum
9
         select ifnull(sum(isi.quantity), 0) totalSum
10
         from item_seizure_record isr
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
-        where  isr.process_status=3
12
+        where isr.process_status=3
13
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
13
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
14
         <if test="startDate != null and endDate != null">
14
         <if test="startDate != null and endDate != null">
15
             and (isr.seizure_time >= #{startDate}
15
             and (isr.seizure_time >= #{startDate}
@@ -63,7 +63,7 @@
63
             and (isr.seizure_time >= #{startDate}
63
             and (isr.seizure_time >= #{startDate}
64
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
64
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
65
         </if>
65
         </if>
66
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
66
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
67
         and isr.process_status=3
67
         and isr.process_status=3
68
         order by isr.seizure_time desc
68
         order by isr.seizure_time desc
69
     </select>
69
     </select>
@@ -110,7 +110,7 @@
110
             and (isr.seizure_time >= #{startDate}
110
             and (isr.seizure_time >= #{startDate}
111
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
111
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
112
         </if>
112
         </if>
113
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
113
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
114
         order by isr.seizure_time desc
114
         order by isr.seizure_time desc
115
     </select>
115
     </select>
116
 
116
 
@@ -118,39 +118,39 @@
118
     <select id="category" resultType="com.sundot.airport.item.domain.ItemLargeScreenCommonDto">
118
     <select id="category" resultType="com.sundot.airport.item.domain.ItemLargeScreenCommonDto">
119
         select
119
         select
120
         <!--判断参数里的级别类型,根据级别类型,查询对应级别-->
120
         <!--判断参数里的级别类型,根据级别类型,查询对应级别-->
121
-            <if test="levelType == 1">
122
-                isi.category_code_one code,
123
-                isi.category_name_one name,
124
-                sum(isi.quantity) total
125
-            </if>
126
-            <if test="levelType == 2">
127
-                isi.category_code_two code,
128
-                isi.category_name_two name,
129
-                sum(isi.quantity) total
130
-            </if>
121
+        <if test="levelType == 1">
122
+            isi.category_code_one code,
123
+            isi.category_name_one name,
124
+            sum(isi.quantity) total
125
+        </if>
126
+        <if test="levelType == 2">
127
+            isi.category_code_two code,
128
+            isi.category_name_two name,
129
+            sum(isi.quantity) total
130
+        </if>
131
         from item_seizure_record isr
131
         from item_seizure_record isr
132
         left join item_seizure_items isi on isr.id = isi.record_id
132
         left join item_seizure_items isi on isr.id = isi.record_id
133
-        where  isr.process_status=3
133
+        where isr.process_status=3
134
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
134
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
135
         <if test="startDate != null and endDate != null">
135
         <if test="startDate != null and endDate != null">
136
             and (isr.seizure_time >= #{startDate}
136
             and (isr.seizure_time >= #{startDate}
137
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
137
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
138
         </if>
138
         </if>
139
-        <if test="levelType == 2  and categoryCode != null and  categoryCode != ''" >
139
+        <if test="levelType == 2  and categoryCode != null and  categoryCode != ''">
140
             and isi.category_code_one = #{categoryCode}
140
             and isi.category_code_one = #{categoryCode}
141
         </if>
141
         </if>
142
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
142
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
143
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
143
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
144
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
144
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
145
         group by
145
         group by
146
-            <if test="levelType == 1">
147
-                isi.category_code_one,
148
-                isi.category_name_one
149
-            </if>
150
-            <if test="levelType == 2">
151
-                isi.category_code_two,
152
-                isi.category_name_two
153
-            </if>
146
+        <if test="levelType == 1">
147
+            isi.category_code_one,
148
+            isi.category_name_one
149
+        </if>
150
+        <if test="levelType == 2">
151
+            isi.category_code_two,
152
+            isi.category_name_two
153
+        </if>
154
         order by total desc
154
         order by total desc
155
     </select>
155
     </select>
156
 
156
 
@@ -161,13 +161,13 @@
161
         sum(isi.quantity) total
161
         sum(isi.quantity) total
162
         from item_seizure_record isr
162
         from item_seizure_record isr
163
         left join item_seizure_items isi on isr.id = isi.record_id
163
         left join item_seizure_items isi on isr.id = isi.record_id
164
-        where  isr.process_status=3
164
+        where isr.process_status=3
165
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
165
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
166
         <if test="startDate != null and endDate != null">
166
         <if test="startDate != null and endDate != null">
167
             and (isr.seizure_time >= #{startDate}
167
             and (isr.seizure_time >= #{startDate}
168
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
168
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
169
         </if>
169
         </if>
170
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
170
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
171
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
171
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
172
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
172
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
173
         group by isr.check_method,
173
         group by isr.check_method,
@@ -183,13 +183,13 @@
183
         ifnull(sum(case when isi.is_active_concealment = 1 then isi.quantity else 0 end), 0) as concealTotal
183
         ifnull(sum(case when isi.is_active_concealment = 1 then isi.quantity else 0 end), 0) as concealTotal
184
         from item_seizure_record isr
184
         from item_seizure_record isr
185
         left join item_seizure_items isi on isr.id = isi.record_id
185
         left join item_seizure_items isi on isr.id = isi.record_id
186
-        where  isr.process_status=3
186
+        where isr.process_status=3
187
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
187
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
188
         <if test="startDate != null and endDate != null">
188
         <if test="startDate != null and endDate != null">
189
             and (isr.seizure_time >= #{startDate}
189
             and (isr.seizure_time >= #{startDate}
190
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
190
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
191
         </if>
191
         </if>
192
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
192
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
193
     </select>
193
     </select>
194
 
194
 
195
     <!--查获排名-按科室-->
195
     <!--查获排名-按科室-->
@@ -199,13 +199,13 @@
199
         sum(isi.quantity) total
199
         sum(isi.quantity) total
200
         from item_seizure_record isr
200
         from item_seizure_record isr
201
         left join item_seizure_items isi on isr.id = isi.record_id
201
         left join item_seizure_items isi on isr.id = isi.record_id
202
-        where  isr.process_status=3
202
+        where isr.process_status=3
203
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
203
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
204
         <if test="startDate != null and endDate != null">
204
         <if test="startDate != null and endDate != null">
205
             and (isr.seizure_time >= #{startDate}
205
             and (isr.seizure_time >= #{startDate}
206
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
206
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
207
         </if>
207
         </if>
208
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
208
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
209
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
209
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
210
             and isi.category_code_one = #{categoryCodeOne}
210
             and isi.category_code_one = #{categoryCodeOne}
211
         </if>
211
         </if>
@@ -226,13 +226,13 @@
226
         sum(isi.quantity) total
226
         sum(isi.quantity) total
227
         from item_seizure_record isr
227
         from item_seizure_record isr
228
         left join item_seizure_items isi on isr.id = isi.record_id
228
         left join item_seizure_items isi on isr.id = isi.record_id
229
-        where  isr.process_status=3
229
+        where isr.process_status=3
230
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
230
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
231
         <if test="startDate != null and endDate != null">
231
         <if test="startDate != null and endDate != null">
232
             and (isr.seizure_time >= #{startDate}
232
             and (isr.seizure_time >= #{startDate}
233
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
233
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
234
         </if>
234
         </if>
235
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
235
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
236
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
236
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
237
             and isi.category_code_one = #{categoryCodeOne}
237
             and isi.category_code_one = #{categoryCodeOne}
238
         </if>
238
         </if>
@@ -253,14 +253,14 @@
253
         sum(isi.quantity) total
253
         sum(isi.quantity) total
254
         from item_seizure_record isr
254
         from item_seizure_record isr
255
         left join item_seizure_items isi on isr.id = isi.record_id
255
         left join item_seizure_items isi on isr.id = isi.record_id
256
-        where  isr.process_status=3
256
+        where isr.process_status=3
257
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
257
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
258
         <if test="startDate != null and endDate != null">
258
         <if test="startDate != null and endDate != null">
259
             and (isr.seizure_time >= #{startDate}
259
             and (isr.seizure_time >= #{startDate}
260
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
260
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
261
         </if>
261
         </if>
262
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
263
-        <if test="inspectTeamId != null"> and isr.inspect_team_id = #{inspectTeamId} </if>
262
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
263
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
264
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
264
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
265
             and isi.category_code_one = #{categoryCodeOne}
265
             and isi.category_code_one = #{categoryCodeOne}
266
         </if>
266
         </if>
@@ -276,63 +276,63 @@
276
 
276
 
277
     <!--查获时段分布-->
277
     <!--查获时段分布-->
278
     <select id="timeSpan" resultType="com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto">
278
     <select id="timeSpan" resultType="com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto">
279
-        select hours.hour                   as hourOfDay,
280
-               ifnull(sum(isi.quantity), 0) as total
279
+        select hours.hour as hourOfDay,
280
+        ifnull(sum(isi.quantity), 0) as total
281
         from (select 0 as hour
281
         from (select 0 as hour
282
-              union
283
-              select 1
284
-              union
285
-              select 2
286
-              union
287
-              select 3
288
-              union
289
-              select 4
290
-              union
291
-              select 5
292
-              union
293
-              select 6
294
-              union
295
-              select 7
296
-              union
297
-              select 8
298
-              union
299
-              select 9
300
-              union
301
-              select 10
302
-              union
303
-              select 11
304
-              union
305
-              select 12
306
-              union
307
-              select 13
308
-              union
309
-              select 14
310
-              union
311
-              select 15
312
-              union
313
-              select 16
314
-              union
315
-              select 17
316
-              union
317
-              select 18
318
-              union
319
-              select 19
320
-              union
321
-              select 20
322
-              union
323
-              select 21
324
-              union
325
-              select 22
326
-              union
327
-              select 23) as hours
328
-                 left join item_seizure_record isr
329
-                           on hours.hour = hour (isr.seizure_time)
282
+        union
283
+        select 1
284
+        union
285
+        select 2
286
+        union
287
+        select 3
288
+        union
289
+        select 4
290
+        union
291
+        select 5
292
+        union
293
+        select 6
294
+        union
295
+        select 7
296
+        union
297
+        select 8
298
+        union
299
+        select 9
300
+        union
301
+        select 10
302
+        union
303
+        select 11
304
+        union
305
+        select 12
306
+        union
307
+        select 13
308
+        union
309
+        select 14
310
+        union
311
+        select 15
312
+        union
313
+        select 16
314
+        union
315
+        select 17
316
+        union
317
+        select 18
318
+        union
319
+        select 19
320
+        union
321
+        select 20
322
+        union
323
+        select 21
324
+        union
325
+        select 22
326
+        union
327
+        select 23) as hours
328
+        left join item_seizure_record isr
329
+        on hours.hour = hour (isr.seizure_time)
330
         <if test="specifiedDate != null and specifiedDate != null">
330
         <if test="specifiedDate != null and specifiedDate != null">
331
-        and date (isr.seizure_time) = #{specifiedDate}
331
+            and date (isr.seizure_time) = #{specifiedDate}
332
         </if>
332
         </if>
333
-            left join item_seizure_items isi
333
+        left join item_seizure_items isi
334
         on isr.id = isi.record_id
334
         on isr.id = isi.record_id
335
-        where  isr.process_status=3
335
+        where isr.process_status=3
336
         <if test="startDate != null and endDate != null">
336
         <if test="startDate != null and endDate != null">
337
             and (isr.seizure_time >= #{startDate}
337
             and (isr.seizure_time >= #{startDate}
338
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
338
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
@@ -343,7 +343,7 @@
343
         <if test="categoryCodeTwo != null and  categoryCodeTwo != ''">
343
         <if test="categoryCodeTwo != null and  categoryCodeTwo != ''">
344
             and isi.category_code_two = #{categoryCodeTwo}
344
             and isi.category_code_two = #{categoryCodeTwo}
345
         </if>
345
         </if>
346
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
346
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
347
         <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
347
         <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
348
         <if test="isConceal=='1' or  isConceal==1 ">and isi.is_active_concealment = 1</if>
348
         <if test="isConceal=='1' or  isConceal==1 ">and isi.is_active_concealment = 1</if>
349
         group by hours.hour
349
         group by hours.hour
@@ -353,7 +353,7 @@
353
     <!--按天统计趋势数据-->
353
     <!--按天统计趋势数据-->
354
     <select id="dailyTrend" resultType="com.sundot.airport.item.domain.ItemLargeScreenDailyTrendDto">
354
     <select id="dailyTrend" resultType="com.sundot.airport.item.domain.ItemLargeScreenDailyTrendDto">
355
         select DATE(isr.seizure_time) as date,
355
         select DATE(isr.seizure_time) as date,
356
-               ifnull(sum(isi.quantity), 0) as total
356
+        ifnull(sum(isi.quantity), 0) as total
357
         from item_seizure_record isr
357
         from item_seizure_record isr
358
         left join item_seizure_items isi on isr.id = isi.record_id
358
         left join item_seizure_items isi on isr.id = isi.record_id
359
         where isr.process_status = 3
359
         where isr.process_status = 3
@@ -361,7 +361,7 @@
361
             and (isr.seizure_time >= #{startDate}
361
             and (isr.seizure_time >= #{startDate}
362
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
362
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
363
         </if>
363
         </if>
364
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
364
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
365
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
365
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
366
             and isi.category_code_one = #{categoryCodeOne}
366
             and isi.category_code_one = #{categoryCodeOne}
367
         </if>
367
         </if>
@@ -383,13 +383,13 @@
383
         sum(isi.quantity) total
383
         sum(isi.quantity) total
384
         from item_seizure_record isr
384
         from item_seizure_record isr
385
         left join item_seizure_items isi on isr.id = isi.record_id
385
         left join item_seizure_items isi on isr.id = isi.record_id
386
-        where  isr.process_status=3
386
+        where isr.process_status=3
387
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
387
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
388
         <if test="startDate != null and endDate != null">
388
         <if test="startDate != null and endDate != null">
389
             and (isr.seizure_time >= #{startDate}
389
             and (isr.seizure_time >= #{startDate}
390
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
390
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
391
         </if>
391
         </if>
392
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
392
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
393
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
393
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
394
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
394
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
395
         group by isi.check_position_code_one,
395
         group by isi.check_position_code_one,
@@ -408,13 +408,13 @@
408
         sum(isi.quantity) total
408
         sum(isi.quantity) total
409
         from item_seizure_record isr
409
         from item_seizure_record isr
410
         left join item_seizure_items isi on isr.id = isi.record_id
410
         left join item_seizure_items isi on isr.id = isi.record_id
411
-        where  isr.process_status=3
411
+        where isr.process_status=3
412
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
412
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
413
         <if test="startDate != null and endDate != null">
413
         <if test="startDate != null and endDate != null">
414
             and (isr.seizure_time >= #{startDate}
414
             and (isr.seizure_time >= #{startDate}
415
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
415
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
416
         </if>
416
         </if>
417
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
417
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
418
         group by isr.regional_code,
418
         group by isr.regional_code,
419
         isr.regional_name,
419
         isr.regional_name,
420
         isi.category_code_one,
420
         isi.category_code_one,
@@ -435,16 +435,18 @@
435
         sum(isi.quantity) total
435
         sum(isi.quantity) total
436
         from item_seizure_record isr
436
         from item_seizure_record isr
437
         left join item_seizure_items isi on isr.id = isi.record_id
437
         left join item_seizure_items isi on isr.id = isi.record_id
438
-        where  isr.process_status=3
438
+        where isr.process_status=3
439
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
439
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
440
         <if test="startDate != null and endDate != null">
440
         <if test="startDate != null and endDate != null">
441
             and (isr.seizure_time >= #{startDate}
441
             and (isr.seizure_time >= #{startDate}
442
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
442
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
443
         </if>
443
         </if>
444
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
444
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
445
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
445
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
446
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
446
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
447
-        <if test="levelType == 2 and positionCode!=null and positionCode!=''">and  isi.check_position_code_one = #{positionCode}</if>
447
+        <if test="levelType == 2 and positionCode!=null and positionCode!=''">and isi.check_position_code_one =
448
+            #{positionCode}
449
+        </if>
448
         group by
450
         group by
449
         <if test="levelType == 1">
451
         <if test="levelType == 1">
450
             isi.check_position_code_one,
452
             isi.check_position_code_one,