chenshudong hace 1 mes
padre
commit
2b6b9d177c

+ 14 - 25
airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedLuggageStatisticsDailyController.java

@@ -2,6 +2,7 @@ package com.sundot.airport.web.controller.blocked;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
+
5
 import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.*;
8
 import org.springframework.web.bind.annotation.*;
@@ -17,14 +18,13 @@ import com.sundot.airport.common.core.page.TableDataInfo;
17
 
18
 
18
 /**
19
 /**
19
  * 每日行李过检查堵统计Controller
20
  * 每日行李过检查堵统计Controller
20
- * 
21
+ *
21
  * @author wangxx
22
  * @author wangxx
22
  * @date 2026-04-13
23
  * @date 2026-04-13
23
  */
24
  */
24
 @RestController
25
 @RestController
25
 @RequestMapping("/blocked/daily")
26
 @RequestMapping("/blocked/daily")
26
-public class BlockedLuggageStatisticsDailyController extends BaseController
27
-{
27
+public class BlockedLuggageStatisticsDailyController extends BaseController {
28
     @Autowired
28
     @Autowired
29
     private IBlockedLuggageStatisticsDailyService blockedLuggageStatisticsDailyService;
29
     private IBlockedLuggageStatisticsDailyService blockedLuggageStatisticsDailyService;
30
 
30
 
@@ -33,8 +33,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
33
      */
33
      */
34
     @PreAuthorize("@ss.hasPermi('blocked:daily:list')")
34
     @PreAuthorize("@ss.hasPermi('blocked:daily:list')")
35
     @GetMapping("/list")
35
     @GetMapping("/list")
36
-    public TableDataInfo list(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
37
-    {
36
+    public TableDataInfo list(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
38
         startPage();
37
         startPage();
39
         List<BlockedLuggageStatisticsDaily> list = blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
38
         List<BlockedLuggageStatisticsDaily> list = blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
40
         return getDataTable(list);
39
         return getDataTable(list);
@@ -46,8 +45,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
46
     @PreAuthorize("@ss.hasPermi('blocked:daily:export')")
45
     @PreAuthorize("@ss.hasPermi('blocked:daily:export')")
47
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.EXPORT)
46
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.EXPORT)
48
     @PostMapping("/export")
47
     @PostMapping("/export")
49
-    public void export(HttpServletResponse response, BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
50
-    {
48
+    public void export(HttpServletResponse response, BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
51
         List<BlockedLuggageStatisticsDaily> list = blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
49
         List<BlockedLuggageStatisticsDaily> list = blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
52
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
50
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
53
         util.exportExcel(response, list, "每日行李过检查堵统计数据");
51
         util.exportExcel(response, list, "每日行李过检查堵统计数据");
@@ -59,8 +57,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
59
     @PreAuthorize("@ss.hasPermi('blocked:daily:import')")
57
     @PreAuthorize("@ss.hasPermi('blocked:daily:import')")
60
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.IMPORT)
58
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.IMPORT)
61
     @PostMapping("/importData")
59
     @PostMapping("/importData")
62
-    public AjaxResult importData(MultipartFile file, @RequestParam(defaultValue = "false") boolean updateSupport) throws Exception
63
-    {
60
+    public AjaxResult importData(MultipartFile file, @RequestParam(defaultValue = "false") boolean updateSupport) throws Exception {
64
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
61
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
65
         List<BlockedLuggageStatisticsDaily> list = util.importExcel(file.getInputStream());
62
         List<BlockedLuggageStatisticsDaily> list = util.importExcel(file.getInputStream());
66
         String message = blockedLuggageStatisticsDailyService.importData(list, updateSupport);
63
         String message = blockedLuggageStatisticsDailyService.importData(list, updateSupport);
@@ -71,8 +68,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
71
      * 获取导入模板
68
      * 获取导入模板
72
      */
69
      */
73
     @PostMapping("/importTemplate")
70
     @PostMapping("/importTemplate")
74
-    public void importTemplate(HttpServletResponse response)
75
-    {
71
+    public void importTemplate(HttpServletResponse response) {
76
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
72
         ExcelUtil<BlockedLuggageStatisticsDaily> util = new ExcelUtil<BlockedLuggageStatisticsDaily>(BlockedLuggageStatisticsDaily.class);
77
         util.importTemplateExcel(response, "每日行李过检查堵统计数据");
73
         util.importTemplateExcel(response, "每日行李过检查堵统计数据");
78
     }
74
     }
@@ -82,8 +78,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
82
      */
78
      */
83
     @PreAuthorize("@ss.hasPermi('blocked:daily:query')")
79
     @PreAuthorize("@ss.hasPermi('blocked:daily:query')")
84
     @GetMapping(value = "/{id}")
80
     @GetMapping(value = "/{id}")
85
-    public AjaxResult getInfo(@PathVariable("id") Long id)
86
-    {
81
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
87
         return success(blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyById(id));
82
         return success(blockedLuggageStatisticsDailyService.selectBlockedLuggageStatisticsDailyById(id));
88
     }
83
     }
89
 
84
 
@@ -92,11 +87,9 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
92
      */
87
      */
93
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
88
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
94
     @GetMapping("/checkDuplicate")
89
     @GetMapping("/checkDuplicate")
95
-    public AjaxResult checkDuplicate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
96
-    {
90
+    public AjaxResult checkDuplicate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
97
         BlockedLuggageStatisticsDaily duplicate = blockedLuggageStatisticsDailyService.checkDuplicate(blockedLuggageStatisticsDaily);
91
         BlockedLuggageStatisticsDaily duplicate = blockedLuggageStatisticsDailyService.checkDuplicate(blockedLuggageStatisticsDaily);
98
-        if (duplicate != null)
99
-        {
92
+        if (duplicate != null) {
100
             return AjaxResult.warn("数据已存在,是否覆盖?", duplicate);
93
             return AjaxResult.warn("数据已存在,是否覆盖?", duplicate);
101
         }
94
         }
102
         return success();
95
         return success();
@@ -108,8 +101,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
108
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
101
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
109
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.INSERT)
102
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.INSERT)
110
     @PostMapping
103
     @PostMapping
111
-    public AjaxResult add(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
112
-    {
104
+    public AjaxResult add(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
113
         blockedLuggageStatisticsDaily.setCreateBy(getUsername());
105
         blockedLuggageStatisticsDaily.setCreateBy(getUsername());
114
         return toAjax(blockedLuggageStatisticsDailyService.insertBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily));
106
         return toAjax(blockedLuggageStatisticsDailyService.insertBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily));
115
     }
107
     }
@@ -120,8 +112,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
120
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
112
     @PreAuthorize("@ss.hasPermi('blocked:daily:add')")
121
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.INSERT)
113
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.INSERT)
122
     @PostMapping("/addOrOverwrite")
114
     @PostMapping("/addOrOverwrite")
123
-    public AjaxResult addOrOverwrite(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
124
-    {
115
+    public AjaxResult addOrOverwrite(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
125
         blockedLuggageStatisticsDaily.setCreateBy(getUsername());
116
         blockedLuggageStatisticsDaily.setCreateBy(getUsername());
126
         blockedLuggageStatisticsDaily.setUpdateBy(getUsername());
117
         blockedLuggageStatisticsDaily.setUpdateBy(getUsername());
127
         return toAjax(blockedLuggageStatisticsDailyService.insertOrUpdate(blockedLuggageStatisticsDaily));
118
         return toAjax(blockedLuggageStatisticsDailyService.insertOrUpdate(blockedLuggageStatisticsDaily));
@@ -133,8 +124,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
133
     @PreAuthorize("@ss.hasPermi('blocked:daily:edit')")
124
     @PreAuthorize("@ss.hasPermi('blocked:daily:edit')")
134
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.UPDATE)
125
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.UPDATE)
135
     @PutMapping
126
     @PutMapping
136
-    public AjaxResult edit(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
137
-    {
127
+    public AjaxResult edit(@RequestBody BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
138
         blockedLuggageStatisticsDaily.setUpdateBy(getUsername());
128
         blockedLuggageStatisticsDaily.setUpdateBy(getUsername());
139
         return toAjax(blockedLuggageStatisticsDailyService.updateBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily));
129
         return toAjax(blockedLuggageStatisticsDailyService.updateBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily));
140
     }
130
     }
@@ -145,8 +135,7 @@ public class BlockedLuggageStatisticsDailyController extends BaseController
145
     @PreAuthorize("@ss.hasPermi('blocked:daily:remove')")
135
     @PreAuthorize("@ss.hasPermi('blocked:daily:remove')")
146
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.DELETE)
136
     @Log(title = "每日行李过检查堵统计", businessType = BusinessType.DELETE)
147
     @DeleteMapping("/{ids}")
137
     @DeleteMapping("/{ids}")
148
-    public AjaxResult remove(@PathVariable Long[] ids)
149
-    {
138
+    public AjaxResult remove(@PathVariable Long[] ids) {
150
         return toAjax(blockedLuggageStatisticsDailyService.deleteBlockedLuggageStatisticsDailyByIds(ids));
139
         return toAjax(blockedLuggageStatisticsDailyService.deleteBlockedLuggageStatisticsDailyByIds(ids));
151
     }
140
     }
152
 }
141
 }

+ 116 - 188
airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedLuggageStatisticsDaily.java

@@ -2,6 +2,7 @@ package com.sundot.airport.blocked.domain;
2
 
2
 
3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
 import java.util.Date;
4
 import java.util.Date;
5
+
5
 import com.fasterxml.jackson.annotation.JsonFormat;
6
 import com.fasterxml.jackson.annotation.JsonFormat;
6
 import io.swagger.annotations.ApiModelProperty;
7
 import io.swagger.annotations.ApiModelProperty;
7
 import org.apache.commons.lang3.builder.ToStringBuilder;
8
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,12 +12,11 @@ import com.sundot.airport.common.core.domain.BaseEntity;
11
 
12
 
12
 /**
13
 /**
13
  * 每日行李过检查堵统计对象 blocked_luggage_statistics_daily
14
  * 每日行李过检查堵统计对象 blocked_luggage_statistics_daily
14
- * 
15
+ *
15
  * @author wangxx
16
  * @author wangxx
16
  * @date 2026-04-13
17
  * @date 2026-04-13
17
  */
18
  */
18
-public class BlockedLuggageStatisticsDaily extends BaseEntity
19
-{
19
+public class BlockedLuggageStatisticsDaily extends BaseEntity {
20
     private static final long serialVersionUID = 1L;
20
     private static final long serialVersionUID = 1L;
21
 
21
 
22
     /** 主键ID */
22
     /** 主键ID */
@@ -197,409 +197,337 @@ public class BlockedLuggageStatisticsDaily extends BaseEntity
197
     @ApiModelProperty("删除标志")
197
     @ApiModelProperty("删除标志")
198
     private String delFlag;
198
     private String delFlag;
199
 
199
 
200
-    public void setId(Long id) 
201
-    {
200
+    public void setId(Long id) {
202
         this.id = id;
201
         this.id = id;
203
     }
202
     }
204
 
203
 
205
-    public Long getId() 
206
-    {
204
+    public Long getId() {
207
         return id;
205
         return id;
208
     }
206
     }
209
 
207
 
210
-    public void setStatDate(Date statDate) 
211
-    {
208
+    public void setStatDate(Date statDate) {
212
         this.statDate = statDate;
209
         this.statDate = statDate;
213
     }
210
     }
214
 
211
 
215
-    public Date getStatDate() 
216
-    {
212
+    public Date getStatDate() {
217
         return statDate;
213
         return statDate;
218
     }
214
     }
219
 
215
 
220
-    public void setShiftType(String shiftType) 
221
-    {
216
+    public void setShiftType(String shiftType) {
222
         this.shiftType = shiftType;
217
         this.shiftType = shiftType;
223
     }
218
     }
224
 
219
 
225
-    public String getShiftType() 
226
-    {
220
+    public String getShiftType() {
227
         return shiftType;
221
         return shiftType;
228
     }
222
     }
229
 
223
 
230
-    public void setBrigadeId(Long brigadeId) 
231
-    {
224
+    public void setBrigadeId(Long brigadeId) {
232
         this.brigadeId = brigadeId;
225
         this.brigadeId = brigadeId;
233
     }
226
     }
234
 
227
 
235
-    public Long getBrigadeId() 
236
-    {
228
+    public Long getBrigadeId() {
237
         return brigadeId;
229
         return brigadeId;
238
     }
230
     }
239
 
231
 
240
-    public void setBrigadeName(String brigadeName) 
241
-    {
232
+    public void setBrigadeName(String brigadeName) {
242
         this.brigadeName = brigadeName;
233
         this.brigadeName = brigadeName;
243
     }
234
     }
244
 
235
 
245
-    public String getBrigadeName() 
246
-    {
236
+    public String getBrigadeName() {
247
         return brigadeName;
237
         return brigadeName;
248
     }
238
     }
249
 
239
 
250
-    public void setT1TravelLuggageCount(Integer t1TravelLuggageCount) 
251
-    {
240
+    public void setT1TravelLuggageCount(Integer t1TravelLuggageCount) {
252
         this.t1TravelLuggageCount = t1TravelLuggageCount;
241
         this.t1TravelLuggageCount = t1TravelLuggageCount;
253
     }
242
     }
254
 
243
 
255
-    public Integer getT1TravelLuggageCount() 
256
-    {
244
+    public Integer getT1TravelLuggageCount() {
257
         return t1TravelLuggageCount;
245
         return t1TravelLuggageCount;
258
     }
246
     }
259
 
247
 
260
-    public void setT1WalkLuggageCount(Integer t1WalkLuggageCount) 
261
-    {
248
+    public void setT1WalkLuggageCount(Integer t1WalkLuggageCount) {
262
         this.t1WalkLuggageCount = t1WalkLuggageCount;
249
         this.t1WalkLuggageCount = t1WalkLuggageCount;
263
     }
250
     }
264
 
251
 
265
-    public Integer getT1WalkLuggageCount() 
266
-    {
252
+    public Integer getT1WalkLuggageCount() {
267
         return t1WalkLuggageCount;
253
         return t1WalkLuggageCount;
268
     }
254
     }
269
 
255
 
270
-    public void setT2TravelLuggageCount(Integer t2TravelLuggageCount) 
271
-    {
256
+    public void setT2TravelLuggageCount(Integer t2TravelLuggageCount) {
272
         this.t2TravelLuggageCount = t2TravelLuggageCount;
257
         this.t2TravelLuggageCount = t2TravelLuggageCount;
273
     }
258
     }
274
 
259
 
275
-    public Integer getT2TravelLuggageCount() 
276
-    {
260
+    public Integer getT2TravelLuggageCount() {
277
         return t2TravelLuggageCount;
261
         return t2TravelLuggageCount;
278
     }
262
     }
279
 
263
 
280
-    public void setT2WalkLuggageCount(Integer t2WalkLuggageCount) 
281
-    {
264
+    public void setT2WalkLuggageCount(Integer t2WalkLuggageCount) {
282
         this.t2WalkLuggageCount = t2WalkLuggageCount;
265
         this.t2WalkLuggageCount = t2WalkLuggageCount;
283
     }
266
     }
284
 
267
 
285
-    public Integer getT2WalkLuggageCount() 
286
-    {
268
+    public Integer getT2WalkLuggageCount() {
287
         return t2WalkLuggageCount;
269
         return t2WalkLuggageCount;
288
     }
270
     }
289
 
271
 
290
-    public void setT1TravelBlockedCount(Integer t1TravelBlockedCount) 
291
-    {
272
+    public void setT1TravelBlockedCount(Integer t1TravelBlockedCount) {
292
         this.t1TravelBlockedCount = t1TravelBlockedCount;
273
         this.t1TravelBlockedCount = t1TravelBlockedCount;
293
     }
274
     }
294
 
275
 
295
-    public Integer getT1TravelBlockedCount() 
296
-    {
276
+    public Integer getT1TravelBlockedCount() {
297
         return t1TravelBlockedCount;
277
         return t1TravelBlockedCount;
298
     }
278
     }
299
 
279
 
300
-    public void setT2TravelBlockedCount(Integer t2TravelBlockedCount) 
301
-    {
280
+    public void setT2TravelBlockedCount(Integer t2TravelBlockedCount) {
302
         this.t2TravelBlockedCount = t2TravelBlockedCount;
281
         this.t2TravelBlockedCount = t2TravelBlockedCount;
303
     }
282
     }
304
 
283
 
305
-    public Integer getT2TravelBlockedCount() 
306
-    {
284
+    public Integer getT2TravelBlockedCount() {
307
         return t2TravelBlockedCount;
285
         return t2TravelBlockedCount;
308
     }
286
     }
309
 
287
 
310
-    public void setT1WalkBlockedCount(Integer t1WalkBlockedCount) 
311
-    {
288
+    public void setT1WalkBlockedCount(Integer t1WalkBlockedCount) {
312
         this.t1WalkBlockedCount = t1WalkBlockedCount;
289
         this.t1WalkBlockedCount = t1WalkBlockedCount;
313
     }
290
     }
314
 
291
 
315
-    public Integer getT1WalkBlockedCount() 
316
-    {
292
+    public Integer getT1WalkBlockedCount() {
317
         return t1WalkBlockedCount;
293
         return t1WalkBlockedCount;
318
     }
294
     }
319
 
295
 
320
-    public void setT2WalkBlockedCount(Integer t2WalkBlockedCount) 
321
-    {
296
+    public void setT2WalkBlockedCount(Integer t2WalkBlockedCount) {
322
         this.t2WalkBlockedCount = t2WalkBlockedCount;
297
         this.t2WalkBlockedCount = t2WalkBlockedCount;
323
     }
298
     }
324
 
299
 
325
-    public Integer getT2WalkBlockedCount() 
326
-    {
300
+    public Integer getT2WalkBlockedCount() {
327
         return t2WalkBlockedCount;
301
         return t2WalkBlockedCount;
328
     }
302
     }
329
 
303
 
330
-    public void setT1ReviewImageTotal(Integer t1ReviewImageTotal) 
331
-    {
304
+    public void setT1ReviewImageTotal(Integer t1ReviewImageTotal) {
332
         this.t1ReviewImageTotal = t1ReviewImageTotal;
305
         this.t1ReviewImageTotal = t1ReviewImageTotal;
333
     }
306
     }
334
 
307
 
335
-    public Integer getT1ReviewImageTotal() 
336
-    {
308
+    public Integer getT1ReviewImageTotal() {
337
         return t1ReviewImageTotal;
309
         return t1ReviewImageTotal;
338
     }
310
     }
339
 
311
 
340
-    public void setT1AiMarkTotal(Integer t1AiMarkTotal) 
341
-    {
312
+    public void setT1AiMarkTotal(Integer t1AiMarkTotal) {
342
         this.t1AiMarkTotal = t1AiMarkTotal;
313
         this.t1AiMarkTotal = t1AiMarkTotal;
343
     }
314
     }
344
 
315
 
345
-    public Integer getT1AiMarkTotal() 
346
-    {
316
+    public Integer getT1AiMarkTotal() {
347
         return t1AiMarkTotal;
317
         return t1AiMarkTotal;
348
     }
318
     }
349
 
319
 
350
-    public void setT1AiErrorTotal(Integer t1AiErrorTotal) 
351
-    {
320
+    public void setT1AiErrorTotal(Integer t1AiErrorTotal) {
352
         this.t1AiErrorTotal = t1AiErrorTotal;
321
         this.t1AiErrorTotal = t1AiErrorTotal;
353
     }
322
     }
354
 
323
 
355
-    public Integer getT1AiErrorTotal() 
356
-    {
324
+    public Integer getT1AiErrorTotal() {
357
         return t1AiErrorTotal;
325
         return t1AiErrorTotal;
358
     }
326
     }
359
 
327
 
360
-    public void setT1AiMissTotal(Integer t1AiMissTotal) 
361
-    {
328
+    public void setT1AiMissTotal(Integer t1AiMissTotal) {
362
         this.t1AiMissTotal = t1AiMissTotal;
329
         this.t1AiMissTotal = t1AiMissTotal;
363
     }
330
     }
364
 
331
 
365
-    public Integer getT1AiMissTotal() 
366
-    {
332
+    public Integer getT1AiMissTotal() {
367
         return t1AiMissTotal;
333
         return t1AiMissTotal;
368
     }
334
     }
369
 
335
 
370
-    public void setT2ReviewImageTotal(Integer t2ReviewImageTotal) 
371
-    {
336
+    public void setT2ReviewImageTotal(Integer t2ReviewImageTotal) {
372
         this.t2ReviewImageTotal = t2ReviewImageTotal;
337
         this.t2ReviewImageTotal = t2ReviewImageTotal;
373
     }
338
     }
374
 
339
 
375
-    public Integer getT2ReviewImageTotal() 
376
-    {
340
+    public Integer getT2ReviewImageTotal() {
377
         return t2ReviewImageTotal;
341
         return t2ReviewImageTotal;
378
     }
342
     }
379
 
343
 
380
-    public void setT2AiMarkTotal(Integer t2AiMarkTotal) 
381
-    {
344
+    public void setT2AiMarkTotal(Integer t2AiMarkTotal) {
382
         this.t2AiMarkTotal = t2AiMarkTotal;
345
         this.t2AiMarkTotal = t2AiMarkTotal;
383
     }
346
     }
384
 
347
 
385
-    public Integer getT2AiMarkTotal() 
386
-    {
348
+    public Integer getT2AiMarkTotal() {
387
         return t2AiMarkTotal;
349
         return t2AiMarkTotal;
388
     }
350
     }
389
 
351
 
390
-    public void setT2AiErrorTotal(Integer t2AiErrorTotal) 
391
-    {
352
+    public void setT2AiErrorTotal(Integer t2AiErrorTotal) {
392
         this.t2AiErrorTotal = t2AiErrorTotal;
353
         this.t2AiErrorTotal = t2AiErrorTotal;
393
     }
354
     }
394
 
355
 
395
-    public Integer getT2AiErrorTotal() 
396
-    {
356
+    public Integer getT2AiErrorTotal() {
397
         return t2AiErrorTotal;
357
         return t2AiErrorTotal;
398
     }
358
     }
399
 
359
 
400
-    public void setT2AiMissTotal(Integer t2AiMissTotal) 
401
-    {
360
+    public void setT2AiMissTotal(Integer t2AiMissTotal) {
402
         this.t2AiMissTotal = t2AiMissTotal;
361
         this.t2AiMissTotal = t2AiMissTotal;
403
     }
362
     }
404
 
363
 
405
-    public Integer getT2AiMissTotal() 
406
-    {
364
+    public Integer getT2AiMissTotal() {
407
         return t2AiMissTotal;
365
         return t2AiMissTotal;
408
     }
366
     }
409
 
367
 
410
-    public void setOtherVipCount(Integer otherVipCount) 
411
-    {
368
+    public void setOtherVipCount(Integer otherVipCount) {
412
         this.otherVipCount = otherVipCount;
369
         this.otherVipCount = otherVipCount;
413
     }
370
     }
414
 
371
 
415
-    public Integer getOtherVipCount() 
416
-    {
372
+    public Integer getOtherVipCount() {
417
         return otherVipCount;
373
         return otherVipCount;
418
     }
374
     }
419
 
375
 
420
-    public void setT1TravelBlockRate(BigDecimal t1TravelBlockRate) 
421
-    {
376
+    public void setT1TravelBlockRate(BigDecimal t1TravelBlockRate) {
422
         this.t1TravelBlockRate = t1TravelBlockRate;
377
         this.t1TravelBlockRate = t1TravelBlockRate;
423
     }
378
     }
424
 
379
 
425
-    public BigDecimal getT1TravelBlockRate() 
426
-    {
380
+    public BigDecimal getT1TravelBlockRate() {
427
         return t1TravelBlockRate;
381
         return t1TravelBlockRate;
428
     }
382
     }
429
 
383
 
430
-    public void setT2TravelBlockRate(BigDecimal t2TravelBlockRate) 
431
-    {
384
+    public void setT2TravelBlockRate(BigDecimal t2TravelBlockRate) {
432
         this.t2TravelBlockRate = t2TravelBlockRate;
385
         this.t2TravelBlockRate = t2TravelBlockRate;
433
     }
386
     }
434
 
387
 
435
-    public BigDecimal getT2TravelBlockRate() 
436
-    {
388
+    public BigDecimal getT2TravelBlockRate() {
437
         return t2TravelBlockRate;
389
         return t2TravelBlockRate;
438
     }
390
     }
439
 
391
 
440
-    public void setT1WalkBlockRate(BigDecimal t1WalkBlockRate) 
441
-    {
392
+    public void setT1WalkBlockRate(BigDecimal t1WalkBlockRate) {
442
         this.t1WalkBlockRate = t1WalkBlockRate;
393
         this.t1WalkBlockRate = t1WalkBlockRate;
443
     }
394
     }
444
 
395
 
445
-    public BigDecimal getT1WalkBlockRate() 
446
-    {
396
+    public BigDecimal getT1WalkBlockRate() {
447
         return t1WalkBlockRate;
397
         return t1WalkBlockRate;
448
     }
398
     }
449
 
399
 
450
-    public void setT2WalkBlockRate(BigDecimal t2WalkBlockRate) 
451
-    {
400
+    public void setT2WalkBlockRate(BigDecimal t2WalkBlockRate) {
452
         this.t2WalkBlockRate = t2WalkBlockRate;
401
         this.t2WalkBlockRate = t2WalkBlockRate;
453
     }
402
     }
454
 
403
 
455
-    public BigDecimal getT2WalkBlockRate() 
456
-    {
404
+    public BigDecimal getT2WalkBlockRate() {
457
         return t2WalkBlockRate;
405
         return t2WalkBlockRate;
458
     }
406
     }
459
 
407
 
460
-    public void setTotalBlockRate(BigDecimal totalBlockRate) 
461
-    {
408
+    public void setTotalBlockRate(BigDecimal totalBlockRate) {
462
         this.totalBlockRate = totalBlockRate;
409
         this.totalBlockRate = totalBlockRate;
463
     }
410
     }
464
 
411
 
465
-    public BigDecimal getTotalBlockRate() 
466
-    {
412
+    public BigDecimal getTotalBlockRate() {
467
         return totalBlockRate;
413
         return totalBlockRate;
468
     }
414
     }
469
 
415
 
470
-    public void setDailyBlockRate(BigDecimal dailyBlockRate) 
471
-    {
416
+    public void setDailyBlockRate(BigDecimal dailyBlockRate) {
472
         this.dailyBlockRate = dailyBlockRate;
417
         this.dailyBlockRate = dailyBlockRate;
473
     }
418
     }
474
 
419
 
475
-    public BigDecimal getDailyBlockRate() 
476
-    {
420
+    public BigDecimal getDailyBlockRate() {
477
         return dailyBlockRate;
421
         return dailyBlockRate;
478
     }
422
     }
479
 
423
 
480
-    public void setTotalLuggageCount(Integer totalLuggageCount) 
481
-    {
424
+    public void setTotalLuggageCount(Integer totalLuggageCount) {
482
         this.totalLuggageCount = totalLuggageCount;
425
         this.totalLuggageCount = totalLuggageCount;
483
     }
426
     }
484
 
427
 
485
-    public Integer getTotalLuggageCount() 
486
-    {
428
+    public Integer getTotalLuggageCount() {
487
         return totalLuggageCount;
429
         return totalLuggageCount;
488
     }
430
     }
489
 
431
 
490
-    public void setTotalBlockedCount(Integer totalBlockedCount) 
491
-    {
432
+    public void setTotalBlockedCount(Integer totalBlockedCount) {
492
         this.totalBlockedCount = totalBlockedCount;
433
         this.totalBlockedCount = totalBlockedCount;
493
     }
434
     }
494
 
435
 
495
-    public Integer getTotalBlockedCount() 
496
-    {
436
+    public Integer getTotalBlockedCount() {
497
         return totalBlockedCount;
437
         return totalBlockedCount;
498
     }
438
     }
499
 
439
 
500
-    public void setDailyBlockedCount(Integer dailyBlockedCount) 
501
-    {
440
+    public void setDailyBlockedCount(Integer dailyBlockedCount) {
502
         this.dailyBlockedCount = dailyBlockedCount;
441
         this.dailyBlockedCount = dailyBlockedCount;
503
     }
442
     }
504
 
443
 
505
-    public Integer getDailyBlockedCount() 
506
-    {
444
+    public Integer getDailyBlockedCount() {
507
         return dailyBlockedCount;
445
         return dailyBlockedCount;
508
     }
446
     }
509
 
447
 
510
-    public void setAiReviewImageTotal(Integer aiReviewImageTotal) 
511
-    {
448
+    public void setAiReviewImageTotal(Integer aiReviewImageTotal) {
512
         this.aiReviewImageTotal = aiReviewImageTotal;
449
         this.aiReviewImageTotal = aiReviewImageTotal;
513
     }
450
     }
514
 
451
 
515
-    public Integer getAiReviewImageTotal() 
516
-    {
452
+    public Integer getAiReviewImageTotal() {
517
         return aiReviewImageTotal;
453
         return aiReviewImageTotal;
518
     }
454
     }
519
 
455
 
520
-    public void setAiMarkTotal(Integer aiMarkTotal) 
521
-    {
456
+    public void setAiMarkTotal(Integer aiMarkTotal) {
522
         this.aiMarkTotal = aiMarkTotal;
457
         this.aiMarkTotal = aiMarkTotal;
523
     }
458
     }
524
 
459
 
525
-    public Integer getAiMarkTotal() 
526
-    {
460
+    public Integer getAiMarkTotal() {
527
         return aiMarkTotal;
461
         return aiMarkTotal;
528
     }
462
     }
529
 
463
 
530
-    public void setAiErrorImageTotal(Integer aiErrorImageTotal) 
531
-    {
464
+    public void setAiErrorImageTotal(Integer aiErrorImageTotal) {
532
         this.aiErrorImageTotal = aiErrorImageTotal;
465
         this.aiErrorImageTotal = aiErrorImageTotal;
533
     }
466
     }
534
 
467
 
535
-    public Integer getAiErrorImageTotal() 
536
-    {
468
+    public Integer getAiErrorImageTotal() {
537
         return aiErrorImageTotal;
469
         return aiErrorImageTotal;
538
     }
470
     }
539
 
471
 
540
-    public void setAiMissImageTotal(Integer aiMissImageTotal) 
541
-    {
472
+    public void setAiMissImageTotal(Integer aiMissImageTotal) {
542
         this.aiMissImageTotal = aiMissImageTotal;
473
         this.aiMissImageTotal = aiMissImageTotal;
543
     }
474
     }
544
 
475
 
545
-    public Integer getAiMissImageTotal() 
546
-    {
476
+    public Integer getAiMissImageTotal() {
547
         return aiMissImageTotal;
477
         return aiMissImageTotal;
548
     }
478
     }
549
 
479
 
550
-    public void setDelFlag(String delFlag) 
551
-    {
480
+    public void setDelFlag(String delFlag) {
552
         this.delFlag = delFlag;
481
         this.delFlag = delFlag;
553
     }
482
     }
554
 
483
 
555
-    public String getDelFlag() 
556
-    {
484
+    public String getDelFlag() {
557
         return delFlag;
485
         return delFlag;
558
     }
486
     }
559
 
487
 
560
     @Override
488
     @Override
561
     public String toString() {
489
     public String toString() {
562
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
490
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
563
-            .append("id", getId())
564
-            .append("statDate", getStatDate())
565
-            .append("shiftType", getShiftType())
566
-            .append("brigadeId", getBrigadeId())
567
-            .append("brigadeName", getBrigadeName())
568
-            .append("t1TravelLuggageCount", getT1TravelLuggageCount())
569
-            .append("t1WalkLuggageCount", getT1WalkLuggageCount())
570
-            .append("t2TravelLuggageCount", getT2TravelLuggageCount())
571
-            .append("t2WalkLuggageCount", getT2WalkLuggageCount())
572
-            .append("t1TravelBlockedCount", getT1TravelBlockedCount())
573
-            .append("t2TravelBlockedCount", getT2TravelBlockedCount())
574
-            .append("t1WalkBlockedCount", getT1WalkBlockedCount())
575
-            .append("t2WalkBlockedCount", getT2WalkBlockedCount())
576
-            .append("t1ReviewImageTotal", getT1ReviewImageTotal())
577
-            .append("t1AiMarkTotal", getT1AiMarkTotal())
578
-            .append("t1AiErrorTotal", getT1AiErrorTotal())
579
-            .append("t1AiMissTotal", getT1AiMissTotal())
580
-            .append("t2ReviewImageTotal", getT2ReviewImageTotal())
581
-            .append("t2AiMarkTotal", getT2AiMarkTotal())
582
-            .append("t2AiErrorTotal", getT2AiErrorTotal())
583
-            .append("t2AiMissTotal", getT2AiMissTotal())
584
-            .append("otherVipCount", getOtherVipCount())
585
-            .append("t1TravelBlockRate", getT1TravelBlockRate())
586
-            .append("t2TravelBlockRate", getT2TravelBlockRate())
587
-            .append("t1WalkBlockRate", getT1WalkBlockRate())
588
-            .append("t2WalkBlockRate", getT2WalkBlockRate())
589
-            .append("totalBlockRate", getTotalBlockRate())
590
-            .append("dailyBlockRate", getDailyBlockRate())
591
-            .append("totalLuggageCount", getTotalLuggageCount())
592
-            .append("totalBlockedCount", getTotalBlockedCount())
593
-            .append("dailyBlockedCount", getDailyBlockedCount())
594
-            .append("aiReviewImageTotal", getAiReviewImageTotal())
595
-            .append("aiMarkTotal", getAiMarkTotal())
596
-            .append("aiErrorImageTotal", getAiErrorImageTotal())
597
-            .append("aiMissImageTotal", getAiMissImageTotal())
598
-            .append("createBy", getCreateBy())
599
-            .append("createTime", getCreateTime())
600
-            .append("updateBy", getUpdateBy())
601
-            .append("updateTime", getUpdateTime())
602
-            .append("remark", getRemark())
603
-            .toString();
491
+                .append("id", getId())
492
+                .append("statDate", getStatDate())
493
+                .append("shiftType", getShiftType())
494
+                .append("brigadeId", getBrigadeId())
495
+                .append("brigadeName", getBrigadeName())
496
+                .append("t1TravelLuggageCount", getT1TravelLuggageCount())
497
+                .append("t1WalkLuggageCount", getT1WalkLuggageCount())
498
+                .append("t2TravelLuggageCount", getT2TravelLuggageCount())
499
+                .append("t2WalkLuggageCount", getT2WalkLuggageCount())
500
+                .append("t1TravelBlockedCount", getT1TravelBlockedCount())
501
+                .append("t2TravelBlockedCount", getT2TravelBlockedCount())
502
+                .append("t1WalkBlockedCount", getT1WalkBlockedCount())
503
+                .append("t2WalkBlockedCount", getT2WalkBlockedCount())
504
+                .append("t1ReviewImageTotal", getT1ReviewImageTotal())
505
+                .append("t1AiMarkTotal", getT1AiMarkTotal())
506
+                .append("t1AiErrorTotal", getT1AiErrorTotal())
507
+                .append("t1AiMissTotal", getT1AiMissTotal())
508
+                .append("t2ReviewImageTotal", getT2ReviewImageTotal())
509
+                .append("t2AiMarkTotal", getT2AiMarkTotal())
510
+                .append("t2AiErrorTotal", getT2AiErrorTotal())
511
+                .append("t2AiMissTotal", getT2AiMissTotal())
512
+                .append("otherVipCount", getOtherVipCount())
513
+                .append("t1TravelBlockRate", getT1TravelBlockRate())
514
+                .append("t2TravelBlockRate", getT2TravelBlockRate())
515
+                .append("t1WalkBlockRate", getT1WalkBlockRate())
516
+                .append("t2WalkBlockRate", getT2WalkBlockRate())
517
+                .append("totalBlockRate", getTotalBlockRate())
518
+                .append("dailyBlockRate", getDailyBlockRate())
519
+                .append("totalLuggageCount", getTotalLuggageCount())
520
+                .append("totalBlockedCount", getTotalBlockedCount())
521
+                .append("dailyBlockedCount", getDailyBlockedCount())
522
+                .append("aiReviewImageTotal", getAiReviewImageTotal())
523
+                .append("aiMarkTotal", getAiMarkTotal())
524
+                .append("aiErrorImageTotal", getAiErrorImageTotal())
525
+                .append("aiMissImageTotal", getAiMissImageTotal())
526
+                .append("createBy", getCreateBy())
527
+                .append("createTime", getCreateTime())
528
+                .append("updateBy", getUpdateBy())
529
+                .append("updateTime", getUpdateTime())
530
+                .append("remark", getRemark())
531
+                .toString();
604
     }
532
     }
605
 }
533
 }

+ 9 - 9
airport-blocked/src/main/java/com/sundot/airport/blocked/mapper/BlockedLuggageStatisticsDailyMapper.java

@@ -1,19 +1,19 @@
1
 package com.sundot.airport.blocked.mapper;
1
 package com.sundot.airport.blocked.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
+
4
 import com.sundot.airport.blocked.domain.BlockedLuggageStatisticsDaily;
5
 import com.sundot.airport.blocked.domain.BlockedLuggageStatisticsDaily;
5
 
6
 
6
 /**
7
 /**
7
  * 每日行李过检查堵统计Mapper接口
8
  * 每日行李过检查堵统计Mapper接口
8
- * 
9
+ *
9
  * @author wangxx
10
  * @author wangxx
10
  * @date 2026-04-13
11
  * @date 2026-04-13
11
  */
12
  */
12
-public interface BlockedLuggageStatisticsDailyMapper 
13
-{
13
+public interface BlockedLuggageStatisticsDailyMapper {
14
     /**
14
     /**
15
      * 查询每日行李过检查堵统计
15
      * 查询每日行李过检查堵统计
16
-     * 
16
+     *
17
      * @param id 每日行李过检查堵统计主键
17
      * @param id 每日行李过检查堵统计主键
18
      * @return 每日行李过检查堵统计
18
      * @return 每日行李过检查堵统计
19
      */
19
      */
@@ -21,7 +21,7 @@ public interface BlockedLuggageStatisticsDailyMapper
21
 
21
 
22
     /**
22
     /**
23
      * 查询每日行李过检查堵统计列表
23
      * 查询每日行李过检查堵统计列表
24
-     * 
24
+     *
25
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
25
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
26
      * @return 每日行李过检查堵统计集合
26
      * @return 每日行李过检查堵统计集合
27
      */
27
      */
@@ -29,7 +29,7 @@ public interface BlockedLuggageStatisticsDailyMapper
29
 
29
 
30
     /**
30
     /**
31
      * 新增每日行李过检查堵统计
31
      * 新增每日行李过检查堵统计
32
-     * 
32
+     *
33
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
33
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
34
      * @return 结果
34
      * @return 结果
35
      */
35
      */
@@ -37,7 +37,7 @@ public interface BlockedLuggageStatisticsDailyMapper
37
 
37
 
38
     /**
38
     /**
39
      * 修改每日行李过检查堵统计
39
      * 修改每日行李过检查堵统计
40
-     * 
40
+     *
41
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
41
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
42
      * @return 结果
42
      * @return 结果
43
      */
43
      */
@@ -45,7 +45,7 @@ public interface BlockedLuggageStatisticsDailyMapper
45
 
45
 
46
     /**
46
     /**
47
      * 删除每日行李过检查堵统计
47
      * 删除每日行李过检查堵统计
48
-     * 
48
+     *
49
      * @param id 每日行李过检查堵统计主键
49
      * @param id 每日行李过检查堵统计主键
50
      * @return 结果
50
      * @return 结果
51
      */
51
      */
@@ -53,7 +53,7 @@ public interface BlockedLuggageStatisticsDailyMapper
53
 
53
 
54
     /**
54
     /**
55
      * 批量删除每日行李过检查堵统计
55
      * 批量删除每日行李过检查堵统计
56
-     * 
56
+     *
57
      * @param ids 需要删除的数据主键集合
57
      * @param ids 需要删除的数据主键集合
58
      * @return 结果
58
      * @return 结果
59
      */
59
      */

+ 12 - 12
airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedLuggageStatisticsDailyService.java

@@ -1,19 +1,19 @@
1
 package com.sundot.airport.blocked.service;
1
 package com.sundot.airport.blocked.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
+
4
 import com.sundot.airport.blocked.domain.BlockedLuggageStatisticsDaily;
5
 import com.sundot.airport.blocked.domain.BlockedLuggageStatisticsDaily;
5
 
6
 
6
 /**
7
 /**
7
  * 每日行李过检查堵统计Service接口
8
  * 每日行李过检查堵统计Service接口
8
- * 
9
+ *
9
  * @author wangxx
10
  * @author wangxx
10
  * @date 2026-04-13
11
  * @date 2026-04-13
11
  */
12
  */
12
-public interface IBlockedLuggageStatisticsDailyService 
13
-{
13
+public interface IBlockedLuggageStatisticsDailyService {
14
     /**
14
     /**
15
      * 查询每日行李过检查堵统计
15
      * 查询每日行李过检查堵统计
16
-     * 
16
+     *
17
      * @param id 每日行李过检查堵统计主键
17
      * @param id 每日行李过检查堵统计主键
18
      * @return 每日行李过检查堵统计
18
      * @return 每日行李过检查堵统计
19
      */
19
      */
@@ -21,7 +21,7 @@ public interface IBlockedLuggageStatisticsDailyService
21
 
21
 
22
     /**
22
     /**
23
      * 查询每日行李过检查堵统计列表
23
      * 查询每日行李过检查堵统计列表
24
-     * 
24
+     *
25
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
25
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
26
      * @return 每日行李过检查堵统计集合
26
      * @return 每日行李过检查堵统计集合
27
      */
27
      */
@@ -29,7 +29,7 @@ public interface IBlockedLuggageStatisticsDailyService
29
 
29
 
30
     /**
30
     /**
31
      * 新增每日行李过检查堵统计
31
      * 新增每日行李过检查堵统计
32
-     * 
32
+     *
33
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
33
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
34
      * @return 结果
34
      * @return 结果
35
      */
35
      */
@@ -37,7 +37,7 @@ public interface IBlockedLuggageStatisticsDailyService
37
 
37
 
38
     /**
38
     /**
39
      * 修改每日行李过检查堵统计
39
      * 修改每日行李过检查堵统计
40
-     * 
40
+     *
41
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
41
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
42
      * @return 结果
42
      * @return 结果
43
      */
43
      */
@@ -45,7 +45,7 @@ public interface IBlockedLuggageStatisticsDailyService
45
 
45
 
46
     /**
46
     /**
47
      * 批量删除每日行李过检查堵统计
47
      * 批量删除每日行李过检查堵统计
48
-     * 
48
+     *
49
      * @param ids 需要删除的每日行李过检查堵统计主键集合
49
      * @param ids 需要删除的每日行李过检查堵统计主键集合
50
      * @return 结果
50
      * @return 结果
51
      */
51
      */
@@ -53,7 +53,7 @@ public interface IBlockedLuggageStatisticsDailyService
53
 
53
 
54
     /**
54
     /**
55
      * 删除每日行李过检查堵统计信息
55
      * 删除每日行李过检查堵统计信息
56
-     * 
56
+     *
57
      * @param id 每日行李过检查堵统计主键
57
      * @param id 每日行李过检查堵统计主键
58
      * @return 结果
58
      * @return 结果
59
      */
59
      */
@@ -61,7 +61,7 @@ public interface IBlockedLuggageStatisticsDailyService
61
 
61
 
62
     /**
62
     /**
63
      * 导入每日行李过检查堵统计数据
63
      * 导入每日行李过检查堵统计数据
64
-     * 
64
+     *
65
      * @param list 数据列表
65
      * @param list 数据列表
66
      * @param updateSupport 是否更新支持
66
      * @param updateSupport 是否更新支持
67
      * @return 导入结果信息
67
      * @return 导入结果信息
@@ -70,7 +70,7 @@ public interface IBlockedLuggageStatisticsDailyService
70
 
70
 
71
     /**
71
     /**
72
      * 检查数据是否重复
72
      * 检查数据是否重复
73
-     * 
73
+     *
74
      * @param blockedLuggageStatisticsDaily 统计数据
74
      * @param blockedLuggageStatisticsDaily 统计数据
75
      * @return 重复的数据,如果没有重复返回null
75
      * @return 重复的数据,如果没有重复返回null
76
      */
76
      */
@@ -78,7 +78,7 @@ public interface IBlockedLuggageStatisticsDailyService
78
 
78
 
79
     /**
79
     /**
80
      * 新增或更新每日行李过检查堵统计(如果数据重复则覆盖更新)
80
      * 新增或更新每日行李过检查堵统计(如果数据重复则覆盖更新)
81
-     * 
81
+     *
82
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
82
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
83
      * @return 结果
83
      * @return 结果
84
      */
84
      */

+ 66 - 104
airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedLuggageStatisticsDailyServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
4
 import java.math.RoundingMode;
4
 import java.math.RoundingMode;
5
 import java.util.Date;
5
 import java.util.Date;
6
 import java.util.List;
6
 import java.util.List;
7
+
7
 import cn.hutool.core.collection.CollUtil;
8
 import cn.hutool.core.collection.CollUtil;
8
 import cn.hutool.core.util.ObjUtil;
9
 import cn.hutool.core.util.ObjUtil;
9
 import cn.hutool.core.util.StrUtil;
10
 import cn.hutool.core.util.StrUtil;
@@ -20,13 +21,12 @@ import com.sundot.airport.system.service.ISysDeptService;
20
 
21
 
21
 /**
22
 /**
22
  * 每日行李过检查堵统计Service业务层处理
23
  * 每日行李过检查堵统计Service业务层处理
23
- * 
24
+ *
24
  * @author wangxx
25
  * @author wangxx
25
  * @date 2026-04-13
26
  * @date 2026-04-13
26
  */
27
  */
27
 @Service
28
 @Service
28
-public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggageStatisticsDailyService 
29
-{
29
+public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggageStatisticsDailyService {
30
     @Autowired
30
     @Autowired
31
     private BlockedLuggageStatisticsDailyMapper blockedLuggageStatisticsDailyMapper;
31
     private BlockedLuggageStatisticsDailyMapper blockedLuggageStatisticsDailyMapper;
32
 
32
 
@@ -35,38 +35,35 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
35
 
35
 
36
     /**
36
     /**
37
      * 查询每日行李过检查堵统计
37
      * 查询每日行李过检查堵统计
38
-     * 
38
+     *
39
      * @param id 每日行李过检查堵统计主键
39
      * @param id 每日行李过检查堵统计主键
40
      * @return 每日行李过检查堵统计
40
      * @return 每日行李过检查堵统计
41
      */
41
      */
42
     @Override
42
     @Override
43
-    public BlockedLuggageStatisticsDaily selectBlockedLuggageStatisticsDailyById(Long id)
44
-    {
43
+    public BlockedLuggageStatisticsDaily selectBlockedLuggageStatisticsDailyById(Long id) {
45
         return blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyById(id);
44
         return blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyById(id);
46
     }
45
     }
47
 
46
 
48
     /**
47
     /**
49
      * 查询每日行李过检查堵统计列表
48
      * 查询每日行李过检查堵统计列表
50
-     * 
49
+     *
51
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
50
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
52
      * @return 每日行李过检查堵统计
51
      * @return 每日行李过检查堵统计
53
      */
52
      */
54
     @Override
53
     @Override
55
-    public List<BlockedLuggageStatisticsDaily> selectBlockedLuggageStatisticsDailyList(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
56
-    {
54
+    public List<BlockedLuggageStatisticsDaily> selectBlockedLuggageStatisticsDailyList(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
57
         return blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
55
         return blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(blockedLuggageStatisticsDaily);
58
     }
56
     }
59
 
57
 
60
     /**
58
     /**
61
      * 新增每日行李过检查堵统计
59
      * 新增每日行李过检查堵统计
62
-     * 
60
+     *
63
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
61
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
64
      * @return 结果
62
      * @return 结果
65
      */
63
      */
66
     @Override
64
     @Override
67
     @Transactional
65
     @Transactional
68
-    public int insertBlockedLuggageStatisticsDaily(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
69
-    {
66
+    public int insertBlockedLuggageStatisticsDaily(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
70
         // 根据大队名称填充ID
67
         // 根据大队名称填充ID
71
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
68
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
72
         calculateAndSetFields(blockedLuggageStatisticsDaily);
69
         calculateAndSetFields(blockedLuggageStatisticsDaily);
@@ -75,14 +72,13 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
75
 
72
 
76
     /**
73
     /**
77
      * 修改每日行李过检查堵统计
74
      * 修改每日行李过检查堵统计
78
-     * 
75
+     *
79
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
76
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
80
      * @return 结果
77
      * @return 结果
81
      */
78
      */
82
     @Override
79
     @Override
83
     @Transactional
80
     @Transactional
84
-    public int updateBlockedLuggageStatisticsDaily(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
85
-    {
81
+    public int updateBlockedLuggageStatisticsDaily(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
86
         // 根据大队名称填充ID
82
         // 根据大队名称填充ID
87
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
83
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
88
         calculateAndSetFields(blockedLuggageStatisticsDaily);
84
         calculateAndSetFields(blockedLuggageStatisticsDaily);
@@ -91,41 +87,37 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
91
 
87
 
92
     /**
88
     /**
93
      * 批量删除每日行李过检查堵统计
89
      * 批量删除每日行李过检查堵统计
94
-     * 
90
+     *
95
      * @param ids 需要删除的每日行李过检查堵统计主键
91
      * @param ids 需要删除的每日行李过检查堵统计主键
96
      * @return 结果
92
      * @return 结果
97
      */
93
      */
98
     @Override
94
     @Override
99
-    public int deleteBlockedLuggageStatisticsDailyByIds(Long[] ids)
100
-    {
95
+    public int deleteBlockedLuggageStatisticsDailyByIds(Long[] ids) {
101
         return blockedLuggageStatisticsDailyMapper.deleteBlockedLuggageStatisticsDailyByIds(ids);
96
         return blockedLuggageStatisticsDailyMapper.deleteBlockedLuggageStatisticsDailyByIds(ids);
102
     }
97
     }
103
 
98
 
104
     /**
99
     /**
105
      * 删除每日行李过检查堵统计信息
100
      * 删除每日行李过检查堵统计信息
106
-     * 
101
+     *
107
      * @param id 每日行李过检查堵统计主键
102
      * @param id 每日行李过检查堵统计主键
108
      * @return 结果
103
      * @return 结果
109
      */
104
      */
110
     @Override
105
     @Override
111
-    public int deleteBlockedLuggageStatisticsDailyById(Long id)
112
-    {
106
+    public int deleteBlockedLuggageStatisticsDailyById(Long id) {
113
         return blockedLuggageStatisticsDailyMapper.deleteBlockedLuggageStatisticsDailyById(id);
107
         return blockedLuggageStatisticsDailyMapper.deleteBlockedLuggageStatisticsDailyById(id);
114
     }
108
     }
115
 
109
 
116
     /**
110
     /**
117
      * 导入每日行李过检查堵统计数据
111
      * 导入每日行李过检查堵统计数据
118
-     * 
112
+     *
119
      * @param list 数据列表
113
      * @param list 数据列表
120
      * @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
114
      * @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
121
      * @return 结果
115
      * @return 结果
122
      */
116
      */
123
     @Transactional(rollbackFor = Exception.class)
117
     @Transactional(rollbackFor = Exception.class)
124
     @Override
118
     @Override
125
-    public String importData(List<BlockedLuggageStatisticsDaily> list, boolean isUpdateSupport)
126
-    {
127
-        if (CollUtil.isEmpty(list))
128
-        {
119
+    public String importData(List<BlockedLuggageStatisticsDaily> list, boolean isUpdateSupport) {
120
+        if (CollUtil.isEmpty(list)) {
129
             throw new ServiceException("导入每日行李过检查堵统计数据不能为空!");
121
             throw new ServiceException("导入每日行李过检查堵统计数据不能为空!");
130
         }
122
         }
131
 
123
 
@@ -133,50 +125,42 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
133
         int failureNum = 0;
125
         int failureNum = 0;
134
         StringBuilder successMsg = new StringBuilder();
126
         StringBuilder successMsg = new StringBuilder();
135
         StringBuilder failureMsg = new StringBuilder();
127
         StringBuilder failureMsg = new StringBuilder();
136
-        
137
-        for (BlockedLuggageStatisticsDaily data : list)
138
-        {
139
-            try
140
-            {
128
+
129
+        for (BlockedLuggageStatisticsDaily data : list) {
130
+            try {
141
                 fillBrigadeIdByName(data);
131
                 fillBrigadeIdByName(data);
142
                 // 数据校验
132
                 // 数据校验
143
-                if (ObjUtil.isNull(data.getStatDate()))
144
-                {
133
+                if (ObjUtil.isNull(data.getStatDate())) {
145
                     failureNum++;
134
                     failureNum++;
146
                     failureMsg.append("<br/>" + failureNum + "、统计日期不能为空");
135
                     failureMsg.append("<br/>" + failureNum + "、统计日期不能为空");
147
                     continue;
136
                     continue;
148
                 }
137
                 }
149
-                if (ObjUtil.isNull(data.getShiftType()))
150
-                {
138
+                if (ObjUtil.isNull(data.getShiftType())) {
151
                     failureNum++;
139
                     failureNum++;
152
                     failureMsg.append("<br/>" + failureNum + "、班次类型不能为空");
140
                     failureMsg.append("<br/>" + failureNum + "、班次类型不能为空");
153
                     continue;
141
                     continue;
154
                 }
142
                 }
155
-                if (ObjUtil.isNull(data.getBrigadeId()))
156
-                {
143
+                if (ObjUtil.isNull(data.getBrigadeId())) {
157
                     failureNum++;
144
                     failureNum++;
158
                     failureMsg.append("<br/>" + failureNum + "、当班大队ID不能为空");
145
                     failureMsg.append("<br/>" + failureNum + "、当班大队ID不能为空");
159
                     continue;
146
                     continue;
160
                 }
147
                 }
161
-                
148
+
162
                 // 查询是否已存在(根据日期+班次+大队ID唯一索引)
149
                 // 查询是否已存在(根据日期+班次+大队ID唯一索引)
163
                 BlockedLuggageStatisticsDaily queryParam = new BlockedLuggageStatisticsDaily();
150
                 BlockedLuggageStatisticsDaily queryParam = new BlockedLuggageStatisticsDaily();
164
                 queryParam.setStatDate(data.getStatDate());
151
                 queryParam.setStatDate(data.getStatDate());
165
                 queryParam.setShiftType(data.getShiftType());
152
                 queryParam.setShiftType(data.getShiftType());
166
                 queryParam.setBrigadeId(data.getBrigadeId());
153
                 queryParam.setBrigadeId(data.getBrigadeId());
167
                 List<BlockedLuggageStatisticsDaily> existingList = blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(queryParam);
154
                 List<BlockedLuggageStatisticsDaily> existingList = blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(queryParam);
168
-                
169
-                if (CollUtil.isEmpty(existingList))
170
-                {
155
+
156
+                if (CollUtil.isEmpty(existingList)) {
171
                     // 新增
157
                     // 新增
172
                     data.setCreateTime(DateUtils.getNowDate());
158
                     data.setCreateTime(DateUtils.getNowDate());
173
                     calculateAndSetFields(data);
159
                     calculateAndSetFields(data);
174
                     blockedLuggageStatisticsDailyMapper.insertBlockedLuggageStatisticsDaily(data);
160
                     blockedLuggageStatisticsDailyMapper.insertBlockedLuggageStatisticsDaily(data);
175
                     successNum++;
161
                     successNum++;
176
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】导入成功");
162
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】导入成功");
177
-                }
178
-                else if (isUpdateSupport)
179
-                {
163
+                } else if (isUpdateSupport) {
180
                     // 更新
164
                     // 更新
181
                     BlockedLuggageStatisticsDaily old = existingList.get(0);
165
                     BlockedLuggageStatisticsDaily old = existingList.get(0);
182
                     data.setId(old.getId());
166
                     data.setId(old.getId());
@@ -185,28 +169,21 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
185
                     blockedLuggageStatisticsDailyMapper.updateBlockedLuggageStatisticsDaily(data);
169
                     blockedLuggageStatisticsDailyMapper.updateBlockedLuggageStatisticsDaily(data);
186
                     successNum++;
170
                     successNum++;
187
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】更新成功");
171
                     successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】更新成功");
188
-                }
189
-                else
190
-                {
172
+                } else {
191
                     failureNum++;
173
                     failureNum++;
192
                     failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】已存在");
174
                     failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】已存在");
193
                 }
175
                 }
194
-            }
195
-            catch (Exception e)
196
-            {
176
+            } catch (Exception e) {
197
                 failureNum++;
177
                 failureNum++;
198
                 String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】导入失败:";
178
                 String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】导入失败:";
199
                 failureMsg.append(msg + e.getMessage());
179
                 failureMsg.append(msg + e.getMessage());
200
             }
180
             }
201
         }
181
         }
202
-        
203
-        if (failureNum > 0)
204
-        {
182
+
183
+        if (failureNum > 0) {
205
             failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
184
             failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
206
             throw new ServiceException(failureMsg.toString());
185
             throw new ServiceException(failureMsg.toString());
207
-        }
208
-        else
209
-        {
186
+        } else {
210
             successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
187
             successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
211
         }
188
         }
212
         return successMsg.toString();
189
         return successMsg.toString();
@@ -214,31 +191,30 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
214
 
191
 
215
     /**
192
     /**
216
      * 计算并设置所有计算字段
193
      * 计算并设置所有计算字段
217
-     * 
194
+     *
218
      * @param data 统计数据
195
      * @param data 统计数据
219
      */
196
      */
220
-    private void calculateAndSetFields(BlockedLuggageStatisticsDaily data)
221
-    {
197
+    private void calculateAndSetFields(BlockedLuggageStatisticsDaily data) {
222
         // 初始化默认值
198
         // 初始化默认值
223
         initDefaultValues(data);
199
         initDefaultValues(data);
224
-        
200
+
225
         // 计算过检行李合计
201
         // 计算过检行李合计
226
         Integer totalLuggage = (data.getT1TravelLuggageCount() != null ? data.getT1TravelLuggageCount() : 0)
202
         Integer totalLuggage = (data.getT1TravelLuggageCount() != null ? data.getT1TravelLuggageCount() : 0)
227
                 + (data.getT1WalkLuggageCount() != null ? data.getT1WalkLuggageCount() : 0)
203
                 + (data.getT1WalkLuggageCount() != null ? data.getT1WalkLuggageCount() : 0)
228
                 + (data.getT2TravelLuggageCount() != null ? data.getT2TravelLuggageCount() : 0)
204
                 + (data.getT2TravelLuggageCount() != null ? data.getT2TravelLuggageCount() : 0)
229
                 + (data.getT2WalkLuggageCount() != null ? data.getT2WalkLuggageCount() : 0);
205
                 + (data.getT2WalkLuggageCount() != null ? data.getT2WalkLuggageCount() : 0);
230
         data.setTotalLuggageCount(totalLuggage);
206
         data.setTotalLuggageCount(totalLuggage);
231
-        
207
+
232
         // 计算查堵合计件数
208
         // 计算查堵合计件数
233
         Integer totalBlocked = (data.getT1TravelBlockedCount() != null ? data.getT1TravelBlockedCount() : 0)
209
         Integer totalBlocked = (data.getT1TravelBlockedCount() != null ? data.getT1TravelBlockedCount() : 0)
234
                 + (data.getT2TravelBlockedCount() != null ? data.getT2TravelBlockedCount() : 0)
210
                 + (data.getT2TravelBlockedCount() != null ? data.getT2TravelBlockedCount() : 0)
235
                 + (data.getT1WalkBlockedCount() != null ? data.getT1WalkBlockedCount() : 0)
211
                 + (data.getT1WalkBlockedCount() != null ? data.getT1WalkBlockedCount() : 0)
236
                 + (data.getT2WalkBlockedCount() != null ? data.getT2WalkBlockedCount() : 0);
212
                 + (data.getT2WalkBlockedCount() != null ? data.getT2WalkBlockedCount() : 0);
237
         data.setTotalBlockedCount(totalBlocked);
213
         data.setTotalBlockedCount(totalBlocked);
238
-        
214
+
239
         // 当日查堵件数等于查堵合计件数
215
         // 当日查堵件数等于查堵合计件数
240
         data.setDailyBlockedCount(totalBlocked);
216
         data.setDailyBlockedCount(totalBlocked);
241
-        
217
+
242
         // 计算万分率
218
         // 计算万分率
243
         data.setT1TravelBlockRate(calculateBlockRate(data.getT1TravelBlockedCount(), data.getT1TravelLuggageCount()));
219
         data.setT1TravelBlockRate(calculateBlockRate(data.getT1TravelBlockedCount(), data.getT1TravelLuggageCount()));
244
         data.setT2TravelBlockRate(calculateBlockRate(data.getT2TravelBlockedCount(), data.getT2TravelLuggageCount()));
220
         data.setT2TravelBlockRate(calculateBlockRate(data.getT2TravelBlockedCount(), data.getT2TravelLuggageCount()));
@@ -246,32 +222,31 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
246
         data.setT2WalkBlockRate(calculateBlockRate(data.getT2WalkBlockedCount(), data.getT2WalkLuggageCount()));
222
         data.setT2WalkBlockRate(calculateBlockRate(data.getT2WalkBlockedCount(), data.getT2WalkLuggageCount()));
247
         data.setTotalBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
223
         data.setTotalBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
248
         data.setDailyBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
224
         data.setDailyBlockRate(calculateBlockRate(totalBlocked, totalLuggage));
249
-        
225
+
250
         // 计算AI相关合计
226
         // 计算AI相关合计
251
         Integer aiReviewTotal = (data.getT1ReviewImageTotal() != null ? data.getT1ReviewImageTotal() : 0)
227
         Integer aiReviewTotal = (data.getT1ReviewImageTotal() != null ? data.getT1ReviewImageTotal() : 0)
252
                 + (data.getT2ReviewImageTotal() != null ? data.getT2ReviewImageTotal() : 0);
228
                 + (data.getT2ReviewImageTotal() != null ? data.getT2ReviewImageTotal() : 0);
253
         data.setAiReviewImageTotal(aiReviewTotal);
229
         data.setAiReviewImageTotal(aiReviewTotal);
254
-        
230
+
255
         Integer aiMarkTotal = (data.getT1AiMarkTotal() != null ? data.getT1AiMarkTotal() : 0)
231
         Integer aiMarkTotal = (data.getT1AiMarkTotal() != null ? data.getT1AiMarkTotal() : 0)
256
                 + (data.getT2AiMarkTotal() != null ? data.getT2AiMarkTotal() : 0);
232
                 + (data.getT2AiMarkTotal() != null ? data.getT2AiMarkTotal() : 0);
257
         data.setAiMarkTotal(aiMarkTotal);
233
         data.setAiMarkTotal(aiMarkTotal);
258
-        
234
+
259
         Integer aiErrorTotal = (data.getT1AiErrorTotal() != null ? data.getT1AiErrorTotal() : 0)
235
         Integer aiErrorTotal = (data.getT1AiErrorTotal() != null ? data.getT1AiErrorTotal() : 0)
260
                 + (data.getT2AiErrorTotal() != null ? data.getT2AiErrorTotal() : 0);
236
                 + (data.getT2AiErrorTotal() != null ? data.getT2AiErrorTotal() : 0);
261
         data.setAiErrorImageTotal(aiErrorTotal);
237
         data.setAiErrorImageTotal(aiErrorTotal);
262
-        
238
+
263
         Integer aiMissTotal = (data.getT1AiMissTotal() != null ? data.getT1AiMissTotal() : 0)
239
         Integer aiMissTotal = (data.getT1AiMissTotal() != null ? data.getT1AiMissTotal() : 0)
264
                 + (data.getT2AiMissTotal() != null ? data.getT2AiMissTotal() : 0);
240
                 + (data.getT2AiMissTotal() != null ? data.getT2AiMissTotal() : 0);
265
         data.setAiMissImageTotal(aiMissTotal);
241
         data.setAiMissImageTotal(aiMissTotal);
266
     }
242
     }
267
-    
243
+
268
     /**
244
     /**
269
      * 初始化默认值
245
      * 初始化默认值
270
-     * 
246
+     *
271
      * @param data 统计数据
247
      * @param data 统计数据
272
      */
248
      */
273
-    private void initDefaultValues(BlockedLuggageStatisticsDaily data)
274
-    {
249
+    private void initDefaultValues(BlockedLuggageStatisticsDaily data) {
275
         if (data.getT1TravelLuggageCount() == null) data.setT1TravelLuggageCount(0);
250
         if (data.getT1TravelLuggageCount() == null) data.setT1TravelLuggageCount(0);
276
         if (data.getT1WalkLuggageCount() == null) data.setT1WalkLuggageCount(0);
251
         if (data.getT1WalkLuggageCount() == null) data.setT1WalkLuggageCount(0);
277
         if (data.getT2TravelLuggageCount() == null) data.setT2TravelLuggageCount(0);
252
         if (data.getT2TravelLuggageCount() == null) data.setT2TravelLuggageCount(0);
@@ -290,22 +265,19 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
290
         if (data.getT2AiMissTotal() == null) data.setT2AiMissTotal(0);
265
         if (data.getT2AiMissTotal() == null) data.setT2AiMissTotal(0);
291
         if (data.getOtherVipCount() == null) data.setOtherVipCount(0);
266
         if (data.getOtherVipCount() == null) data.setOtherVipCount(0);
292
     }
267
     }
293
-    
268
+
294
     /**
269
     /**
295
      * 计算万分率(查堵件数/过检行李数*10000)
270
      * 计算万分率(查堵件数/过检行李数*10000)
296
-     * 
271
+     *
297
      * @param blockedCount 查堵件数
272
      * @param blockedCount 查堵件数
298
      * @param luggageCount 过检行李数
273
      * @param luggageCount 过检行李数
299
      * @return 万分率(保留2位小数)
274
      * @return 万分率(保留2位小数)
300
      */
275
      */
301
-    private BigDecimal calculateBlockRate(Integer blockedCount, Integer luggageCount)
302
-    {
303
-        if (luggageCount == null || luggageCount == 0)
304
-        {
276
+    private BigDecimal calculateBlockRate(Integer blockedCount, Integer luggageCount) {
277
+        if (luggageCount == null || luggageCount == 0) {
305
             return BigDecimal.ZERO;
278
             return BigDecimal.ZERO;
306
         }
279
         }
307
-        if (blockedCount == null)
308
-        {
280
+        if (blockedCount == null) {
309
             blockedCount = 0;
281
             blockedCount = 0;
310
         }
282
         }
311
         return BigDecimal.valueOf(blockedCount)
283
         return BigDecimal.valueOf(blockedCount)
@@ -315,28 +287,25 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
315
 
287
 
316
     /**
288
     /**
317
      * 检查数据是否重复
289
      * 检查数据是否重复
318
-     * 
290
+     *
319
      * @param blockedLuggageStatisticsDaily 统计数据
291
      * @param blockedLuggageStatisticsDaily 统计数据
320
      * @return 重复的数据,如果没有重复返回null
292
      * @return 重复的数据,如果没有重复返回null
321
      */
293
      */
322
     @Override
294
     @Override
323
-    public BlockedLuggageStatisticsDaily checkDuplicate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
324
-    {
295
+    public BlockedLuggageStatisticsDaily checkDuplicate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
325
         if (ObjUtil.isNull(blockedLuggageStatisticsDaily.getStatDate())
296
         if (ObjUtil.isNull(blockedLuggageStatisticsDaily.getStatDate())
326
                 || ObjUtil.isNull(blockedLuggageStatisticsDaily.getShiftType())
297
                 || ObjUtil.isNull(blockedLuggageStatisticsDaily.getShiftType())
327
-                || ObjUtil.isNull(blockedLuggageStatisticsDaily.getBrigadeId()))
328
-        {
298
+                || ObjUtil.isNull(blockedLuggageStatisticsDaily.getBrigadeId())) {
329
             return null;
299
             return null;
330
         }
300
         }
331
-        
301
+
332
         BlockedLuggageStatisticsDaily queryParam = new BlockedLuggageStatisticsDaily();
302
         BlockedLuggageStatisticsDaily queryParam = new BlockedLuggageStatisticsDaily();
333
         queryParam.setStatDate(blockedLuggageStatisticsDaily.getStatDate());
303
         queryParam.setStatDate(blockedLuggageStatisticsDaily.getStatDate());
334
         queryParam.setShiftType(blockedLuggageStatisticsDaily.getShiftType());
304
         queryParam.setShiftType(blockedLuggageStatisticsDaily.getShiftType());
335
         queryParam.setBrigadeId(blockedLuggageStatisticsDaily.getBrigadeId());
305
         queryParam.setBrigadeId(blockedLuggageStatisticsDaily.getBrigadeId());
336
         List<BlockedLuggageStatisticsDaily> existingList = blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(queryParam);
306
         List<BlockedLuggageStatisticsDaily> existingList = blockedLuggageStatisticsDailyMapper.selectBlockedLuggageStatisticsDailyList(queryParam);
337
-        
338
-        if (CollUtil.isNotEmpty(existingList))
339
-        {
307
+
308
+        if (CollUtil.isNotEmpty(existingList)) {
340
             return existingList.get(0);
309
             return existingList.get(0);
341
         }
310
         }
342
         return null;
311
         return null;
@@ -344,29 +313,25 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
344
 
313
 
345
     /**
314
     /**
346
      * 新增或更新每日行李过检查堵统计(如果数据重复则覆盖更新)
315
      * 新增或更新每日行李过检查堵统计(如果数据重复则覆盖更新)
347
-     * 
316
+     *
348
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
317
      * @param blockedLuggageStatisticsDaily 每日行李过检查堵统计
349
      * @return 结果
318
      * @return 结果
350
      */
319
      */
351
     @Override
320
     @Override
352
     @Transactional
321
     @Transactional
353
-    public int insertOrUpdate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily)
354
-    {
322
+    public int insertOrUpdate(BlockedLuggageStatisticsDaily blockedLuggageStatisticsDaily) {
355
         // 检查是否重复
323
         // 检查是否重复
356
         BlockedLuggageStatisticsDaily existing = checkDuplicate(blockedLuggageStatisticsDaily);
324
         BlockedLuggageStatisticsDaily existing = checkDuplicate(blockedLuggageStatisticsDaily);
357
         // 根据大队名称填充ID
325
         // 根据大队名称填充ID
358
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
326
         fillBrigadeIdByName(blockedLuggageStatisticsDaily);
359
-        if (existing != null)
360
-        {
327
+        if (existing != null) {
361
             // 数据已存在,执行更新(覆盖)
328
             // 数据已存在,执行更新(覆盖)
362
             blockedLuggageStatisticsDaily.setId(existing.getId());
329
             blockedLuggageStatisticsDaily.setId(existing.getId());
363
-            blockedLuggageStatisticsDaily.setUpdateBy(blockedLuggageStatisticsDaily.getUpdateBy() != null 
330
+            blockedLuggageStatisticsDaily.setUpdateBy(blockedLuggageStatisticsDaily.getUpdateBy() != null
364
                     ? blockedLuggageStatisticsDaily.getUpdateBy() : blockedLuggageStatisticsDaily.getCreateBy());
331
                     ? blockedLuggageStatisticsDaily.getUpdateBy() : blockedLuggageStatisticsDaily.getCreateBy());
365
             calculateAndSetFields(blockedLuggageStatisticsDaily);
332
             calculateAndSetFields(blockedLuggageStatisticsDaily);
366
             return blockedLuggageStatisticsDailyMapper.updateBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily);
333
             return blockedLuggageStatisticsDailyMapper.updateBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily);
367
-        }
368
-        else
369
-        {
334
+        } else {
370
             // 数据不存在,执行新增
335
             // 数据不存在,执行新增
371
             calculateAndSetFields(blockedLuggageStatisticsDaily);
336
             calculateAndSetFields(blockedLuggageStatisticsDaily);
372
             return blockedLuggageStatisticsDailyMapper.insertBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily);
337
             return blockedLuggageStatisticsDailyMapper.insertBlockedLuggageStatisticsDaily(blockedLuggageStatisticsDaily);
@@ -375,18 +340,15 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
375
 
340
 
376
     /**
341
     /**
377
      * 根据大队名称填充大队ID
342
      * 根据大队名称填充大队ID
378
-     * 
343
+     *
379
      * @param data 统计数据
344
      * @param data 统计数据
380
      */
345
      */
381
-    private void fillBrigadeIdByName(BlockedLuggageStatisticsDaily data)
382
-    {
383
-        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName()))
384
-        {
346
+    private void fillBrigadeIdByName(BlockedLuggageStatisticsDaily data) {
347
+        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName())) {
385
             SysDept deptQuery = new SysDept();
348
             SysDept deptQuery = new SysDept();
386
             deptQuery.setDeptName(data.getBrigadeName());
349
             deptQuery.setDeptName(data.getBrigadeName());
387
             List<SysDept> deptList = sysDeptService.selectDeptList(deptQuery);
350
             List<SysDept> deptList = sysDeptService.selectDeptList(deptQuery);
388
-            if (CollUtil.isNotEmpty(deptList))
389
-            {
351
+            if (CollUtil.isNotEmpty(deptList)) {
390
                 data.setBrigadeId(deptList.get(0).getDeptId());
352
                 data.setBrigadeId(deptList.get(0).getDeptId());
391
             }
353
             }
392
         }
354
         }

+ 106 - 68
airport-blocked/src/main/resources/mapper/blocked/BlockedLuggageStatisticsDailyMapper.xml

@@ -1,86 +1,121 @@
1
 <?xml version="1.0" encoding="UTF-8" ?>
1
 <?xml version="1.0" encoding="UTF-8" ?>
2
 <!DOCTYPE mapper
2
 <!DOCTYPE mapper
3
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
 <mapper namespace="com.sundot.airport.blocked.mapper.BlockedLuggageStatisticsDailyMapper">
5
 <mapper namespace="com.sundot.airport.blocked.mapper.BlockedLuggageStatisticsDailyMapper">
6
-    
6
+
7
     <resultMap type="BlockedLuggageStatisticsDaily" id="BlockedLuggageStatisticsDailyResult">
7
     <resultMap type="BlockedLuggageStatisticsDaily" id="BlockedLuggageStatisticsDailyResult">
8
-        <result property="id"    column="id"    />
9
-        <result property="statDate"    column="stat_date"    />
10
-        <result property="shiftType"    column="shift_type"    />
11
-        <result property="brigadeId"    column="brigade_id"    />
12
-        <result property="brigadeName"    column="brigade_name"    />
13
-        <result property="t1TravelLuggageCount"    column="t1_travel_luggage_count"    />
14
-        <result property="t1WalkLuggageCount"    column="t1_walk_luggage_count"    />
15
-        <result property="t2TravelLuggageCount"    column="t2_travel_luggage_count"    />
16
-        <result property="t2WalkLuggageCount"    column="t2_walk_luggage_count"    />
17
-        <result property="t1TravelBlockedCount"    column="t1_travel_blocked_count"    />
18
-        <result property="t2TravelBlockedCount"    column="t2_travel_blocked_count"    />
19
-        <result property="t1WalkBlockedCount"    column="t1_walk_blocked_count"    />
20
-        <result property="t2WalkBlockedCount"    column="t2_walk_blocked_count"    />
21
-        <result property="t1ReviewImageTotal"    column="t1_review_image_total"    />
22
-        <result property="t1AiMarkTotal"    column="t1_ai_mark_total"    />
23
-        <result property="t1AiErrorTotal"    column="t1_ai_error_total"    />
24
-        <result property="t1AiMissTotal"    column="t1_ai_miss_total"    />
25
-        <result property="t2ReviewImageTotal"    column="t2_review_image_total"    />
26
-        <result property="t2AiMarkTotal"    column="t2_ai_mark_total"    />
27
-        <result property="t2AiErrorTotal"    column="t2_ai_error_total"    />
28
-        <result property="t2AiMissTotal"    column="t2_ai_miss_total"    />
29
-        <result property="otherVipCount"    column="other_vip_count"    />
30
-        <result property="t1TravelBlockRate"    column="t1_travel_block_rate"    />
31
-        <result property="t2TravelBlockRate"    column="t2_travel_block_rate"    />
32
-        <result property="t1WalkBlockRate"    column="t1_walk_block_rate"    />
33
-        <result property="t2WalkBlockRate"    column="t2_walk_block_rate"    />
34
-        <result property="totalBlockRate"    column="total_block_rate"    />
35
-        <result property="dailyBlockRate"    column="daily_block_rate"    />
36
-        <result property="totalLuggageCount"    column="total_luggage_count"    />
37
-        <result property="totalBlockedCount"    column="total_blocked_count"    />
38
-        <result property="dailyBlockedCount"    column="daily_blocked_count"    />
39
-        <result property="aiReviewImageTotal"    column="ai_review_image_total"    />
40
-        <result property="aiMarkTotal"    column="ai_mark_total"    />
41
-        <result property="aiErrorImageTotal"    column="ai_error_image_total"    />
42
-        <result property="aiMissImageTotal"    column="ai_miss_image_total"    />
43
-        <result property="createBy"    column="create_by"    />
44
-        <result property="createTime"    column="create_time"    />
45
-        <result property="updateBy"    column="update_by"    />
46
-        <result property="updateTime"    column="update_time"    />
47
-        <result property="remark"    column="remark"    />
48
-        <result property="delFlag"    column="del_flag"    />
8
+        <result property="id" column="id"/>
9
+        <result property="statDate" column="stat_date"/>
10
+        <result property="shiftType" column="shift_type"/>
11
+        <result property="brigadeId" column="brigade_id"/>
12
+        <result property="brigadeName" column="brigade_name"/>
13
+        <result property="t1TravelLuggageCount" column="t1_travel_luggage_count"/>
14
+        <result property="t1WalkLuggageCount" column="t1_walk_luggage_count"/>
15
+        <result property="t2TravelLuggageCount" column="t2_travel_luggage_count"/>
16
+        <result property="t2WalkLuggageCount" column="t2_walk_luggage_count"/>
17
+        <result property="t1TravelBlockedCount" column="t1_travel_blocked_count"/>
18
+        <result property="t2TravelBlockedCount" column="t2_travel_blocked_count"/>
19
+        <result property="t1WalkBlockedCount" column="t1_walk_blocked_count"/>
20
+        <result property="t2WalkBlockedCount" column="t2_walk_blocked_count"/>
21
+        <result property="t1ReviewImageTotal" column="t1_review_image_total"/>
22
+        <result property="t1AiMarkTotal" column="t1_ai_mark_total"/>
23
+        <result property="t1AiErrorTotal" column="t1_ai_error_total"/>
24
+        <result property="t1AiMissTotal" column="t1_ai_miss_total"/>
25
+        <result property="t2ReviewImageTotal" column="t2_review_image_total"/>
26
+        <result property="t2AiMarkTotal" column="t2_ai_mark_total"/>
27
+        <result property="t2AiErrorTotal" column="t2_ai_error_total"/>
28
+        <result property="t2AiMissTotal" column="t2_ai_miss_total"/>
29
+        <result property="otherVipCount" column="other_vip_count"/>
30
+        <result property="t1TravelBlockRate" column="t1_travel_block_rate"/>
31
+        <result property="t2TravelBlockRate" column="t2_travel_block_rate"/>
32
+        <result property="t1WalkBlockRate" column="t1_walk_block_rate"/>
33
+        <result property="t2WalkBlockRate" column="t2_walk_block_rate"/>
34
+        <result property="totalBlockRate" column="total_block_rate"/>
35
+        <result property="dailyBlockRate" column="daily_block_rate"/>
36
+        <result property="totalLuggageCount" column="total_luggage_count"/>
37
+        <result property="totalBlockedCount" column="total_blocked_count"/>
38
+        <result property="dailyBlockedCount" column="daily_blocked_count"/>
39
+        <result property="aiReviewImageTotal" column="ai_review_image_total"/>
40
+        <result property="aiMarkTotal" column="ai_mark_total"/>
41
+        <result property="aiErrorImageTotal" column="ai_error_image_total"/>
42
+        <result property="aiMissImageTotal" column="ai_miss_image_total"/>
43
+        <result property="createBy" column="create_by"/>
44
+        <result property="createTime" column="create_time"/>
45
+        <result property="updateBy" column="update_by"/>
46
+        <result property="updateTime" column="update_time"/>
47
+        <result property="remark" column="remark"/>
48
+        <result property="delFlag" column="del_flag"/>
49
     </resultMap>
49
     </resultMap>
50
 
50
 
51
     <sql id="selectBlockedLuggageStatisticsDailyVo">
51
     <sql id="selectBlockedLuggageStatisticsDailyVo">
52
-        select id, stat_date, shift_type, brigade_id, brigade_name, 
53
-               t1_travel_luggage_count, t1_walk_luggage_count, t2_travel_luggage_count, t2_walk_luggage_count,
54
-               t1_travel_blocked_count, t2_travel_blocked_count, t1_walk_blocked_count, t2_walk_blocked_count,
55
-               t1_review_image_total, t1_ai_mark_total, t1_ai_error_total, t1_ai_miss_total,
56
-               t2_review_image_total, t2_ai_mark_total, t2_ai_error_total, t2_ai_miss_total,
52
+        select id,
53
+               stat_date,
54
+               shift_type,
55
+               brigade_id,
56
+               brigade_name,
57
+               t1_travel_luggage_count,
58
+               t1_walk_luggage_count,
59
+               t2_travel_luggage_count,
60
+               t2_walk_luggage_count,
61
+               t1_travel_blocked_count,
62
+               t2_travel_blocked_count,
63
+               t1_walk_blocked_count,
64
+               t2_walk_blocked_count,
65
+               t1_review_image_total,
66
+               t1_ai_mark_total,
67
+               t1_ai_error_total,
68
+               t1_ai_miss_total,
69
+               t2_review_image_total,
70
+               t2_ai_mark_total,
71
+               t2_ai_error_total,
72
+               t2_ai_miss_total,
57
                other_vip_count,
73
                other_vip_count,
58
-               t1_travel_block_rate, t2_travel_block_rate, t1_walk_block_rate, t2_walk_block_rate,
59
-               total_block_rate, daily_block_rate,
60
-               total_luggage_count, total_blocked_count, daily_blocked_count,
61
-               ai_review_image_total, ai_mark_total, ai_error_image_total, ai_miss_image_total,
62
-               create_by, create_time, update_by, update_time, remark, del_flag
74
+               t1_travel_block_rate,
75
+               t2_travel_block_rate,
76
+               t1_walk_block_rate,
77
+               t2_walk_block_rate,
78
+               total_block_rate,
79
+               daily_block_rate,
80
+               total_luggage_count,
81
+               total_blocked_count,
82
+               daily_blocked_count,
83
+               ai_review_image_total,
84
+               ai_mark_total,
85
+               ai_error_image_total,
86
+               ai_miss_image_total,
87
+               create_by,
88
+               create_time,
89
+               update_by,
90
+               update_time,
91
+               remark,
92
+               del_flag
63
         from blocked_luggage_statistics_daily
93
         from blocked_luggage_statistics_daily
64
     </sql>
94
     </sql>
65
 
95
 
66
-    <select id="selectBlockedLuggageStatisticsDailyList" parameterType="BlockedLuggageStatisticsDaily" resultMap="BlockedLuggageStatisticsDailyResult">
96
+    <select id="selectBlockedLuggageStatisticsDailyList" parameterType="BlockedLuggageStatisticsDaily"
97
+            resultMap="BlockedLuggageStatisticsDailyResult">
67
         <include refid="selectBlockedLuggageStatisticsDailyVo"/>
98
         <include refid="selectBlockedLuggageStatisticsDailyVo"/>
68
-        <where>  
99
+        <where>
69
             del_flag = '0'
100
             del_flag = '0'
70
-            <if test="statDate != null "> and stat_date = #{statDate}</if>
71
-            <if test="shiftType != null  and shiftType != ''"> and shift_type = #{shiftType}</if>
72
-            <if test="brigadeId != null "> and brigade_id = #{brigadeId}</if>
73
-            <if test="brigadeName != null  and brigadeName != ''"> and brigade_name like concat('%', #{brigadeName}, '%')</if>
101
+            <if test="statDate != null ">and stat_date = #{statDate}</if>
102
+            <if test="shiftType != null  and shiftType != ''">and shift_type = #{shiftType}</if>
103
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
104
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
105
+                '%')
106
+            </if>
74
         </where>
107
         </where>
75
         order by stat_date desc, shift_type, brigade_id
108
         order by stat_date desc, shift_type, brigade_id
76
     </select>
109
     </select>
77
-    
78
-    <select id="selectBlockedLuggageStatisticsDailyById" parameterType="Long" resultMap="BlockedLuggageStatisticsDailyResult">
110
+
111
+    <select id="selectBlockedLuggageStatisticsDailyById" parameterType="Long"
112
+            resultMap="BlockedLuggageStatisticsDailyResult">
79
         <include refid="selectBlockedLuggageStatisticsDailyVo"/>
113
         <include refid="selectBlockedLuggageStatisticsDailyVo"/>
80
         where id = #{id} and del_flag = '0'
114
         where id = #{id} and del_flag = '0'
81
     </select>
115
     </select>
82
-        
83
-    <insert id="insertBlockedLuggageStatisticsDaily" parameterType="BlockedLuggageStatisticsDaily" useGeneratedKeys="true" keyProperty="id">
116
+
117
+    <insert id="insertBlockedLuggageStatisticsDaily" parameterType="BlockedLuggageStatisticsDaily"
118
+            useGeneratedKeys="true" keyProperty="id">
84
         insert into blocked_luggage_statistics_daily
119
         insert into blocked_luggage_statistics_daily
85
         <trim prefix="(" suffix=")" suffixOverrides=",">
120
         <trim prefix="(" suffix=")" suffixOverrides=",">
86
             <if test="statDate != null">stat_date,</if>
121
             <if test="statDate != null">stat_date,</if>
@@ -123,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
123
             <if test="updateTime != null">update_time,</if>
158
             <if test="updateTime != null">update_time,</if>
124
             <if test="remark != null">remark,</if>
159
             <if test="remark != null">remark,</if>
125
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
160
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
126
-         </trim>
161
+        </trim>
127
         <trim prefix="values (" suffix=")" suffixOverrides=",">
162
         <trim prefix="values (" suffix=")" suffixOverrides=",">
128
             <if test="statDate != null">#{statDate},</if>
163
             <if test="statDate != null">#{statDate},</if>
129
             <if test="shiftType != null and shiftType != ''">#{shiftType},</if>
164
             <if test="shiftType != null and shiftType != ''">#{shiftType},</if>
@@ -165,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
165
             <if test="updateTime != null">#{updateTime},</if>
200
             <if test="updateTime != null">#{updateTime},</if>
166
             <if test="remark != null">#{remark},</if>
201
             <if test="remark != null">#{remark},</if>
167
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
202
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
168
-         </trim>
203
+        </trim>
169
     </insert>
204
     </insert>
170
 
205
 
171
     <update id="updateBlockedLuggageStatisticsDaily" parameterType="BlockedLuggageStatisticsDaily">
206
     <update id="updateBlockedLuggageStatisticsDaily" parameterType="BlockedLuggageStatisticsDaily">
@@ -213,11 +248,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
213
     </update>
248
     </update>
214
 
249
 
215
     <delete id="deleteBlockedLuggageStatisticsDailyById" parameterType="Long">
250
     <delete id="deleteBlockedLuggageStatisticsDailyById" parameterType="Long">
216
-        update blocked_luggage_statistics_daily set del_flag = '2' where id = #{id} and del_flag = '0'
251
+        update blocked_luggage_statistics_daily
252
+        set del_flag = '2'
253
+        where id = #{id}
254
+          and del_flag = '0'
217
     </delete>
255
     </delete>
218
 
256
 
219
     <delete id="deleteBlockedLuggageStatisticsDailyByIds" parameterType="String">
257
     <delete id="deleteBlockedLuggageStatisticsDailyByIds" parameterType="String">
220
-        update blocked_luggage_statistics_daily set del_flag = '2' where id in 
258
+        update blocked_luggage_statistics_daily set del_flag = '2' where id in
221
         <foreach item="id" collection="array" open="(" separator="," close=")">
259
         <foreach item="id" collection="array" open="(" separator="," close=")">
222
             #{id}
260
             #{id}
223
         </foreach>
261
         </foreach>