格式化代码

airport-item/src/main/java/com/sundot/airport/item/mapper/FailedMatchItemMapper.java

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

airport-item/src/main/java/com/sundot/airport/item/mapper/ItemSeizureStatsMapper.java

@@ -11,136 +11,148 @@ import java.util.Date;
  */
 @Mapper
 public interface ItemSeizureStatsMapper {
-    
+
     /**
      * 查询个人有效查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获数量
      */
-    Long selectPersonalEffectiveSeizureCount(@Param("userId") Long userId, 
-                                           @Param("startTime") Date startTime, 
-                                           @Param("endTime") Date endTime);
-    
+    Long selectPersonalEffectiveSeizureCount(@Param("userId") Long userId,
+                                             @Param("startTime") Date startTime,
+                                             @Param("endTime") Date endTime);
+
     /**
      * 查询个人故意隐匿查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获数量
      */
-    Long selectPersonalWillfulConcealmentCount(@Param("userId") Long userId, 
-                                              @Param("startTime") Date startTime, 
-                                              @Param("endTime") Date endTime);
-    
+    Long selectPersonalWillfulConcealmentCount(@Param("userId") Long userId,
+                                               @Param("startTime") Date startTime,
+                                               @Param("endTime") Date endTime);
+
     /**
      * 查询个人移交公安查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获数量
      */
-    Long selectPersonalReferToPoliceCount(@Param("userId") Long userId, 
-                                         @Param("startTime") Date startTime, 
-                                         @Param("endTime") Date endTime);
-    
+    Long selectPersonalReferToPoliceCount(@Param("userId") Long userId,
+                                          @Param("startTime") Date startTime,
+                                          @Param("endTime") Date endTime);
+
     /**
      * 查询班组有效查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获总量统计
      */
-    SeizureStats selectTeamEffectiveSeizureCount(@Param("teamId") Long teamId, 
-                                                @Param("startTime") Date startTime, 
-                                                @Param("endTime") Date endTime);
-    
+    SeizureStats selectTeamEffectiveSeizureCount(@Param("teamId") Long teamId,
+                                                 @Param("startTime") Date startTime,
+                                                 @Param("endTime") Date endTime);
+
     /**
      * 查询班组故意隐匿查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获总量统计
      */
-    SeizureStats selectTeamWillfulConcealmentCount(@Param("teamId") Long teamId, 
-                                                  @Param("startTime") Date startTime, 
-                                                  @Param("endTime") Date endTime);
-    
+    SeizureStats selectTeamWillfulConcealmentCount(@Param("teamId") Long teamId,
+                                                   @Param("startTime") Date startTime,
+                                                   @Param("endTime") Date endTime);
+
     /**
      * 查询班组移交公安查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获总量统计
      */
-    SeizureStats selectTeamReferToPoliceCount(@Param("teamId") Long teamId, 
-                                             @Param("startTime") Date startTime, 
-                                             @Param("endTime") Date endTime);
-    
+    SeizureStats selectTeamReferToPoliceCount(@Param("teamId") Long teamId,
+                                              @Param("startTime") Date startTime,
+                                              @Param("endTime") Date endTime);
+
     /**
      * 查询科室有效查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 有效查获总量统计
      */
-    SeizureStats selectDepartmentEffectiveSeizureCount(@Param("departmentId") Long departmentId, 
-                                                      @Param("startTime") Date startTime, 
-                                                      @Param("endTime") Date endTime);
-    
+    SeizureStats selectDepartmentEffectiveSeizureCount(@Param("departmentId") Long departmentId,
+                                                       @Param("startTime") Date startTime,
+                                                       @Param("endTime") Date endTime);
+
     /**
      * 查询科室故意隐匿查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 故意隐匿查获总量统计
      */
-    SeizureStats selectDepartmentWillfulConcealmentCount(@Param("departmentId") Long departmentId, 
-                                                        @Param("startTime") Date startTime, 
-                                                        @Param("endTime") Date endTime);
-    
+    SeizureStats selectDepartmentWillfulConcealmentCount(@Param("departmentId") Long departmentId,
+                                                         @Param("startTime") Date startTime,
+                                                         @Param("endTime") Date endTime);
+
     /**
      * 查询科室移交公安查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 移交公安查获总量统计
      */
-    SeizureStats selectDepartmentReferToPoliceCount(@Param("departmentId") Long departmentId, 
-                                                   @Param("startTime") Date startTime, 
-                                                   @Param("endTime") Date endTime);
-    
+    SeizureStats selectDepartmentReferToPoliceCount(@Param("departmentId") Long departmentId,
+                                                    @Param("startTime") Date startTime,
+                                                    @Param("endTime") Date endTime);
+
     /**
      * 查询机构站有效查获总量
+     *
      * @param stationId 机构站ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获总量统计
      */
-    SeizureStats selectStationEffectiveSeizureCount(@Param("stationId") Long stationId, 
-                                                   @Param("startTime") Date startTime, 
-                                                   @Param("endTime") Date endTime);
-    
+    SeizureStats selectStationEffectiveSeizureCount(@Param("stationId") Long stationId,
+                                                    @Param("startTime") Date startTime,
+                                                    @Param("endTime") Date endTime);
+
     /**
      * 查询机构站故意隐匿查获总量
+     *
      * @param stationId 机构站ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获总量统计
      */
-    SeizureStats selectStationWillfulConcealmentCount(@Param("stationId") Long stationId, 
-                                                     @Param("startTime") Date startTime, 
-                                                     @Param("endTime") Date endTime);
-    
+    SeizureStats selectStationWillfulConcealmentCount(@Param("stationId") Long stationId,
+                                                      @Param("startTime") Date startTime,
+                                                      @Param("endTime") Date endTime);
+
     /**
      * 查询机构站移交公安查获总量
+     *
      * @param stationId 机构站ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获总量统计
      */
-    SeizureStats selectStationReferToPoliceCount(@Param("stationId") Long stationId, 
-                                                @Param("startTime") Date startTime, 
-                                                @Param("endTime") Date endTime);
+    SeizureStats selectStationReferToPoliceCount(@Param("stationId") Long stationId,
+                                                 @Param("startTime") Date startTime,
+                                                 @Param("endTime") Date endTime);
 }

airport-item/src/main/java/com/sundot/airport/item/service/IFailedMatchItemService.java

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

airport-item/src/main/java/com/sundot/airport/item/service/IItemSeizureStatsService.java

@@ -8,138 +8,153 @@ import java.util.Date;
  * 查获物统计服务接口
  */
 public interface IItemSeizureStatsService {
-    
+
     /**
      * 查询个人有效查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获数量
      */
     Long getPersonalEffectiveSeizureCount(Long userId, Date startTime, Date endTime);
-    
+
     /**
      * 查询个人故意隐匿查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获数量
      */
     Long getPersonalWillfulConcealmentCount(Long userId, Date startTime, Date endTime);
-    
+
     /**
      * 查询个人移交公安查获数量
-     * @param userId 用户ID
+     *
+     * @param userId    用户ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获数量
      */
     Long getPersonalReferToPoliceCount(Long userId, Date startTime, Date endTime);
-    
+
     /**
      * 查询组织有效查获总量
-     * @param deptId 部门ID
+     *
+     * @param deptId    部门ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获总量统计
      */
     SeizureStats getOrgEffectiveSeizureCount(Long deptId, Date startTime, Date endTime);
-    
+
     /**
      * 查询班组有效查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获总量统计
      */
     SeizureStats getTeamEffectiveSeizureCount(Long teamId, Date startTime, Date endTime);
-    
+
     /**
      * 查询科室有效查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 有效查获总量统计
      */
     SeizureStats getDepartmentEffectiveSeizureCount(Long departmentId, Date startTime, Date endTime);
-    
+
     /**
      * 查询站点有效查获总量
+     *
      * @param stationId 站点ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 有效查获总量统计
      */
     SeizureStats getStationEffectiveSeizureCount(Long stationId, Date startTime, Date endTime);
-    
+
     /**
      * 查询组织故意隐匿查获总量
-     * @param deptId 部门ID
+     *
+     * @param deptId    部门ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获总量统计
      */
     SeizureStats getOrgWillfulConcealmentCount(Long deptId, Date startTime, Date endTime);
-    
+
     /**
      * 查询班组故意隐匿查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获总量统计
      */
     SeizureStats getTeamWillfulConcealmentCount(Long teamId, Date startTime, Date endTime);
-    
+
     /**
      * 查询科室故意隐匿查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 故意隐匿查获总量统计
      */
     SeizureStats getDepartmentWillfulConcealmentCount(Long departmentId, Date startTime, Date endTime);
-    
+
     /**
      * 查询站点故意隐匿查获总量
+     *
      * @param stationId 站点ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 故意隐匿查获总量统计
      */
     SeizureStats getStationWillfulConcealmentCount(Long stationId, Date startTime, Date endTime);
-    
+
     /**
      * 查询组织移交公安查获总量
-     * @param deptId 部门ID
+     *
+     * @param deptId    部门ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获总量统计
      */
     SeizureStats getOrgReferToPoliceCount(Long deptId, Date startTime, Date endTime);
-    
+
     /**
      * 查询班组移交公安查获总量
-     * @param teamId 班组ID
+     *
+     * @param teamId    班组ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获总量统计
      */
     SeizureStats getTeamReferToPoliceCount(Long teamId, Date startTime, Date endTime);
-    
+
     /**
      * 查询科室移交公安查获总量
+     *
      * @param departmentId 科室ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param startTime    开始时间
+     * @param endTime      结束时间
      * @return 移交公安查获总量统计
      */
     SeizureStats getDepartmentReferToPoliceCount(Long departmentId, Date startTime, Date endTime);
-    
+
     /**
      * 查询站点移交公安查获总量
+     *
      * @param stationId 站点ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 移交公安查获总量统计
      */
     SeizureStats getStationReferToPoliceCount(Long stationId, Date startTime, Date endTime);

airport-item/src/main/java/com/sundot/airport/item/service/ItemSeizureRecordApprovalHandler.java

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

airport-item/src/main/java/com/sundot/airport/item/service/UserRankingService.java

@@ -14,26 +14,28 @@ import java.util.Map;
  * 用户排名服务接口
  */
 public interface UserRankingService {
-    
+
     /**
      * 获取用户在指定层级的详细排名信息
-     * 
-     * @param dto 查询参数
+     *
+     * @param dto   查询参数
      * @param level 层级类型：station(全站), department(科室), team(班组)
      * @return 用户在该层级的详细排名信息
      */
     ItemLargeScreenCommonDto getUserRankingByLevel(BaseLargeScreenQueryParamDto dto, String level);
 
     /**
-     *  计算站级查获统计
+     * 计算站级查获统计
+     *
      * @param params
      * @return
      */
     List<ItemLargeScreenStatsDto> calculateStationItemSeizure(IndicatorCalculateParams params);
 
-    
+
     /**
      * 获取按天统计的查获趋势数据
+     *
      * @param queryDto 查询参数
      * @return 按天统计的查获趋势数据
      */

airport-item/src/main/java/com/sundot/airport/item/service/impl/FailedMatchItemServiceImpl.java

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

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureItemsServiceImpl.java

@@ -63,10 +63,10 @@ public class ItemSeizureItemsServiceImpl extends ServiceImpl<ItemSeizureItemsMap
     @Override
     public List<ItemSeizureItems> selectItemSeizureItemsList(ItemSeizureItems itemSeizureItems) {
         List<ItemSeizureItems> result = itemSeizureItemsMapper.selectItemSeizureItemsList(itemSeizureItems);
-        if(!CollectionUtils.isEmpty(result)){
+        if (!CollectionUtils.isEmpty(result)) {
             for (ItemSeizureItems itemSeizureItem : result) {
                 String itemType = baseSeizeItemMapper.getItemTypeByName(itemSeizureItem.getItemName());
-                if(StringUtils.isNotEmpty(itemType)){
+                if (StringUtils.isNotEmpty(itemType)) {
                     itemSeizureItem.setCategoryNameOne(itemType);
                 }
             }
@@ -161,25 +161,25 @@ public class ItemSeizureItemsServiceImpl extends ServiceImpl<ItemSeizureItemsMap
      */
     @Override
     public List<ItemSeizureDto> selectByConditions(ItemSeizureParam itemSeizureParam) {
-         List<ItemSeizureDto> itemSeizureParams = itemSeizureItemsMapper.selectByConditions(itemSeizureParam);
-         if(!CollectionUtils.isEmpty(itemSeizureParams)){
-             for(ItemSeizureDto  itemSeizureDto : itemSeizureParams){
-                 if(itemSeizureDto.getCheckMethod().equals("AUDIO")){
-                     itemSeizureDto.setCategoryNameTwo(itemSeizureDto.getItemName());
-                     itemSeizureDto.setRegionalName(itemSeizureDto.getTerminlName()+"/"+itemSeizureDto.getRegionalName()+"/"+itemSeizureDto.getAttendanceStationName());
-                     SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
-                     if(Objects.nonNull(sysUser)){
-                         itemSeizureDto.setInspectUserName(sysUser.getNickName());
-                     }
-                 }else{
-                     SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
-                     if(Objects.nonNull(sysUser)){
-                         itemSeizureDto.setInspectUserName(sysUser.getNickName());
-                     }
-                 }
-             }
-             return itemSeizureParams;
-         }
+        List<ItemSeizureDto> itemSeizureParams = itemSeizureItemsMapper.selectByConditions(itemSeizureParam);
+        if (!CollectionUtils.isEmpty(itemSeizureParams)) {
+            for (ItemSeizureDto itemSeizureDto : itemSeizureParams) {
+                if (itemSeizureDto.getCheckMethod().equals("AUDIO")) {
+                    itemSeizureDto.setCategoryNameTwo(itemSeizureDto.getItemName());
+                    itemSeizureDto.setRegionalName(itemSeizureDto.getTerminlName() + "/" + itemSeizureDto.getRegionalName() + "/" + itemSeizureDto.getAttendanceStationName());
+                    SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
+                    if (Objects.nonNull(sysUser)) {
+                        itemSeizureDto.setInspectUserName(sysUser.getNickName());
+                    }
+                } else {
+                    SysUser sysUser = sysUserService.selectUserById(itemSeizureDto.getInspectUserId());
+                    if (Objects.nonNull(sysUser)) {
+                        itemSeizureDto.setInspectUserName(sysUser.getNickName());
+                    }
+                }
+            }
+            return itemSeizureParams;
+        }
         return itemSeizureParams;
     }
 

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureRecordServiceImpl.java

@@ -43,9 +43,9 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
     @Override
     public ItemSeizureRecord selectItemSeizureRecordById(Long id) {
         ItemSeizureRecord result = itemSeizureRecordMapper.selectItemSeizureRecordById(id);
-        if(Objects.nonNull(result)){
+        if (Objects.nonNull(result)) {
             SysUser sysUser = sysUserService.selectUserById(result.getInspectUserId());
-            if(Objects.nonNull(sysUser)){
+            if (Objects.nonNull(sysUser)) {
                 result.setInspectUserName(sysUser.getNickName());
             }
         }
@@ -78,21 +78,21 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
     public List<ItemSeizureRecord> selectItemSeizureRecordListForExport(ItemSeizureRecordDTO itemSeizureRecord) {
         // 先查询主表记录
         List<ItemSeizureRecord> itemSeizureRecords = itemSeizureRecordMapper.selectItemSeizureRecordList(itemSeizureRecord);
-        
+
         // 如果没有主表记录，直接返回
         if (itemSeizureRecords == null || itemSeizureRecords.isEmpty()) {
             return itemSeizureRecords;
         }
-        
+
         // 提取所有记录的ID
         List<Long> recordIds = new ArrayList<>();
         for (ItemSeizureRecord record : itemSeizureRecords) {
             recordIds.add(record.getId());
         }
-        
+
         // 根据记录ID列表查询所有相关的物品信息
         List<ItemSeizureItems> itemsList = itemSeizureItemsService.selectItemSeizureItemsByRecordIds(recordIds);
-        
+
         // 将物品信息按记录ID分组
         Map<Long, List<ItemSeizureItems>> itemsMap = new HashMap<>();
         if (itemsList != null) {
@@ -106,13 +106,13 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
                 }
             }
         }
-        
+
         // 为每个记录设置物品列表和检查人员名称
         for (ItemSeizureRecord record : itemSeizureRecords) {
             // 设置物品列表
             List<ItemSeizureItems> recordItems = itemsMap.get(record.getId());
             record.setItemSeizureItemsList(recordItems);
-            
+
             // 填充检查人员名称
             if (Objects.isNull(record.getInspectUserName())) {
                 SysUser sysUser = sysUserService.selectUserById(record.getInspectUserId());
@@ -121,7 +121,7 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
                 }
             }
         }
-        
+
         return itemSeizureRecords;
     }
 
@@ -137,7 +137,7 @@ public class ItemSeizureRecordServiceImpl extends ServiceImpl<ItemSeizureRecordM
         itemSeizureRecord.setCreateTime(DateUtils.getNowDate());
         int result = itemSeizureRecordMapper.insertItemSeizureRecord(itemSeizureRecord);
         if (result < 0) {
-          throw new RuntimeException("新增查获记录失败");
+            throw new RuntimeException("新增查获记录失败");
         }
         if (!CollectionUtils.isEmpty(itemSeizureRecord.getItemSeizureItemsList())) {
             itemSeizureRecord.getItemSeizureItemsList().forEach(itemSeizureItems -> {

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemSeizureStatsServiceImpl.java

@@ -13,80 +13,80 @@ import java.util.Date;
  */
 @Service
 public class ItemSeizureStatsServiceImpl implements IItemSeizureStatsService {
-    
+
     @Autowired
     private ItemSeizureStatsMapper itemSeizureStatsMapper;
-    
+
     @Override
     public Long getPersonalEffectiveSeizureCount(Long userId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectPersonalEffectiveSeizureCount(userId, startTime, endTime);
     }
-    
+
     @Override
     public Long getPersonalWillfulConcealmentCount(Long userId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectPersonalWillfulConcealmentCount(userId, startTime, endTime);
     }
-    
+
     @Override
     public Long getPersonalReferToPoliceCount(Long userId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectPersonalReferToPoliceCount(userId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getOrgEffectiveSeizureCount(Long deptId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamEffectiveSeizureCount(deptId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getTeamEffectiveSeizureCount(Long teamId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamEffectiveSeizureCount(teamId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getDepartmentEffectiveSeizureCount(Long departmentId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectDepartmentEffectiveSeizureCount(departmentId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getStationEffectiveSeizureCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationEffectiveSeizureCount(stationId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getOrgWillfulConcealmentCount(Long deptId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamWillfulConcealmentCount(deptId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getTeamWillfulConcealmentCount(Long teamId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamWillfulConcealmentCount(teamId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getDepartmentWillfulConcealmentCount(Long departmentId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectDepartmentWillfulConcealmentCount(departmentId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getStationWillfulConcealmentCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationWillfulConcealmentCount(stationId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getOrgReferToPoliceCount(Long deptId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamReferToPoliceCount(deptId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getTeamReferToPoliceCount(Long teamId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectTeamReferToPoliceCount(teamId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getDepartmentReferToPoliceCount(Long departmentId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectDepartmentReferToPoliceCount(departmentId, startTime, endTime);
     }
-    
+
     @Override
     public SeizureStats getStationReferToPoliceCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationReferToPoliceCount(stationId, startTime, endTime);

airport-item/src/main/resources/mapper/item/ItemSeizureItemsMapper.xml

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

airport-item/src/main/resources/mapper/item/ItemSeizureStatsMapper.xml

@@ -8,217 +8,219 @@
     <select id="selectPersonalEffectiveSeizureCount" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_user_id = #{userId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 个人故意隐匿查获数量 -->
     <select id="selectPersonalWillfulConcealmentCount" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_user_id = #{userId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.is_active_concealment = 1
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 个人移交公安查获数量 -->
     <select id="selectPersonalReferToPoliceCount" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_user_id = #{userId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织有效查获总量 -->
     <select id="selectOrgEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
+        COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
-        WHERE 
-          <choose>
+        WHERE
+        <choose>
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
-          </choose>
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'  -- 已归档状态
+        </choose>
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织故意隐匿查获总量 -->
     <select id="selectOrgWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
+        COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
-        WHERE 
-          <choose>
+        WHERE
+        <choose>
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
-          </choose>
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isi.is_active_concealment = 1
-          AND isr.process_status = '3'  -- 已归档状态
+        </choose>
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isi.is_active_concealment = 1
+        AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织移交公安查获总量 -->
     <select id="selectOrgReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT
+        IFNULL(SUM(isi.quantity), 0) AS totalCount,
+        COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
         LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
-        WHERE 
-          <choose>
+        WHERE
+        <choose>
             <when test="userType.name() == 'TEAM'">isr.inspect_team_id = #{deptId}</when>
             <when test="userType.name() == 'DEPARTMENT'">isr.inspect_department_id = #{deptId}</when>
             <when test="userType.name() == 'STATION'">isr.inspect_station_id = #{deptId}</when>
             <otherwise>isr.inspect_team_id = #{deptId}</otherwise>
-          </choose>
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
-          AND isr.process_status = '3'  -- 已归档状态
+        </choose>
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
+        AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织有效查获总量 - 班组级别 -->
     <select id="selectTeamEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_team_id = #{teamId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织有效查获总量 - 科室级别 -->
-    <select id="selectDepartmentEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+    <select id="selectDepartmentEffectiveSeizureCount"
+            resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_department_id = #{departmentId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织有效查获总量 - 站点级别 -->
     <select id="selectStationEffectiveSeizureCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织故意隐匿查获总量 - 班组级别 -->
     <select id="selectTeamWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_team_id = #{teamId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.is_active_concealment = 1
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织故意隐匿查获总量 - 科室级别 -->
-    <select id="selectDepartmentWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+    <select id="selectDepartmentWillfulConcealmentCount"
+            resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_department_id = #{departmentId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.is_active_concealment = 1
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织故意隐匿查获总量 - 站点级别 -->
     <select id="selectStationWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.is_active_concealment = 1
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织移交公安查获总量 - 班组级别 -->
     <select id="selectTeamReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_team_id = #{teamId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织移交公安查获总量 - 科室级别 -->
     <select id="selectDepartmentReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_department_id = #{departmentId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
     <!-- 组织移交公安查获总量 - 站点级别 -->
     <select id="selectStationReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
-        SELECT 
-            IFNULL(SUM(isi.quantity), 0) AS totalCount,
-            COUNT(DISTINCT isr.inspect_user_id) AS count
+        SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
+               COUNT(DISTINCT isr.inspect_user_id) AS count
         FROM item_seizure_record isr
-        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+            LEFT JOIN item_seizure_items isi
+        ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
           AND isr.seizure_time >= #{startTime}
           AND isr.seizure_time &lt;= #{endTime}
           AND isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'
-          AND isr.process_status = '3'  -- 已归档状态
+          AND isr.process_status = '3' -- 已归档状态
     </select>
 
 </mapper>