组织画像-查获模块

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -194,8 +194,8 @@ public class SysUserController extends BaseController {
         IndicatorCalculateParams indicatorCalculateParams = this.appendParams(dto);
         if (Objects.nonNull(dto.getDeptId())) {
             SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
-            if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
-                indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
+            if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
                 List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dto.getDeptId());
                 indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
                 indicatorCalculateParams.setDeptId(dto.getDeptId());
@@ -258,7 +258,7 @@ public class SysUserController extends BaseController {
         // 返回结果处理
         SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
         if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
-            indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
+            indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
             SysDept temp = new SysDept();
             temp.setParentId(dto.getDeptId());
             List<SysDept> deptList = deptService.selectDeptInfoAll(temp);

airport-common/src/main/java/com/sundot/airport/common/enums/portrait/UserType.java

@@ -21,6 +21,11 @@ public enum UserType {
     DEPARTMENT("科级"),
 
     /**
+     * 大队单位
+     */
+    BRIGADE("大队"),
+
+    /**
      * 站级单位
      */
     STATION("站级");
@@ -62,6 +67,8 @@ public enum UserType {
                 return TEAM;
             case "department":
                 return DEPARTMENT;
+            case "brigade":
+                return BRIGADE;
             case "station":
                 return STATION;
             default:

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

@@ -97,6 +97,18 @@ public interface ItemSeizureStatsMapper {
                                                        @Param("endTime") Date endTime);
 
     /**
+     * 查询大队有效查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 有效查获总量统计
+     */
+    SeizureStats selectBrigadeEffectiveSeizureCount(@Param("brigadeId") Long brigadeId,
+                                                    @Param("startTime") Date startTime,
+                                                    @Param("endTime") Date endTime);
+
+    /**
      * 查询科室故意隐匿查获总量
      *
      * @param departmentId 科室ID
@@ -109,6 +121,18 @@ public interface ItemSeizureStatsMapper {
                                                          @Param("endTime") Date endTime);
 
     /**
+     * 查询大队故意隐匿查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 故意隐匿查获总量统计
+     */
+    SeizureStats selectBrigadeWillfulConcealmentCount(@Param("brigadeId") Long brigadeId,
+                                                      @Param("startTime") Date startTime,
+                                                      @Param("endTime") Date endTime);
+
+    /**
      * 查询科室移交公安查获总量
      *
      * @param departmentId 科室ID
@@ -121,6 +145,18 @@ public interface ItemSeizureStatsMapper {
                                                     @Param("endTime") Date endTime);
 
     /**
+     * 查询大队移交公安查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 移交公安查获总量统计
+     */
+    SeizureStats selectBrigadeReferToPoliceCount(@Param("brigadeId") Long brigadeId,
+                                                 @Param("startTime") Date startTime,
+                                                 @Param("endTime") Date endTime);
+
+    /**
      * 查询机构站有效查获总量
      *
      * @param stationId 机构站ID

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

@@ -70,6 +70,16 @@ public interface IItemSeizureStatsService {
     SeizureStats getDepartmentEffectiveSeizureCount(Long departmentId, Date startTime, Date endTime);
 
     /**
+     * 查询大队有效查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 有效查获总量统计
+     */
+    SeizureStats getBrigadeEffectiveSeizureCount(Long brigadeId, Date startTime, Date endTime);
+
+    /**
      * 查询站点有效查获总量
      *
      * @param stationId 站点ID
@@ -110,6 +120,16 @@ public interface IItemSeizureStatsService {
     SeizureStats getDepartmentWillfulConcealmentCount(Long departmentId, Date startTime, Date endTime);
 
     /**
+     * 查询大队故意隐匿查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 故意隐匿查获总量统计
+     */
+    SeizureStats getBrigadeWillfulConcealmentCount(Long brigadeId, Date startTime, Date endTime);
+
+    /**
      * 查询站点故意隐匿查获总量
      *
      * @param stationId 站点ID
@@ -150,6 +170,16 @@ public interface IItemSeizureStatsService {
     SeizureStats getDepartmentReferToPoliceCount(Long departmentId, Date startTime, Date endTime);
 
     /**
+     * 查询大队移交公安查获总量
+     *
+     * @param brigadeId 大队ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 移交公安查获总量统计
+     */
+    SeizureStats getBrigadeReferToPoliceCount(Long brigadeId, Date startTime, Date endTime);
+
+    /**
      * 查询站点移交公安查获总量
      *
      * @param stationId 站点ID

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

@@ -48,6 +48,11 @@ public class ItemSeizureStatsServiceImpl implements IItemSeizureStatsService {
     }
 
     @Override
+    public SeizureStats getBrigadeEffectiveSeizureCount(Long brigadeId, Date startTime, Date endTime) {
+        return itemSeizureStatsMapper.selectBrigadeEffectiveSeizureCount(brigadeId, startTime, endTime);
+    }
+
+    @Override
     public SeizureStats getStationEffectiveSeizureCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationEffectiveSeizureCount(stationId, startTime, endTime);
     }
@@ -68,6 +73,11 @@ public class ItemSeizureStatsServiceImpl implements IItemSeizureStatsService {
     }
 
     @Override
+    public SeizureStats getBrigadeWillfulConcealmentCount(Long brigadeId, Date startTime, Date endTime) {
+        return itemSeizureStatsMapper.selectBrigadeWillfulConcealmentCount(brigadeId, startTime, endTime);
+    }
+
+    @Override
     public SeizureStats getStationWillfulConcealmentCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationWillfulConcealmentCount(stationId, startTime, endTime);
     }
@@ -88,6 +98,11 @@ public class ItemSeizureStatsServiceImpl implements IItemSeizureStatsService {
     }
 
     @Override
+    public SeizureStats getBrigadeReferToPoliceCount(Long brigadeId, Date startTime, Date endTime) {
+        return itemSeizureStatsMapper.selectBrigadeReferToPoliceCount(brigadeId, startTime, endTime);
+    }
+
+    @Override
     public SeizureStats getStationReferToPoliceCount(Long stationId, Date startTime, Date endTime) {
         return itemSeizureStatsMapper.selectStationReferToPoliceCount(stationId, startTime, endTime);
     }

airport-item/src/main/java/com/sundot/airport/item/service/portrait/EffectiveSeizureCountIndicator.java

@@ -56,6 +56,9 @@ public class EffectiveSeizureCountIndicator implements Indicator<Object> {
         } else if (UserType.DEPARTMENT.equals(userType)) {
             // 科室：周期内总量
             this.value = itemSeizureStatsService.getDepartmentEffectiveSeizureCount(deptId, startTime, endTime);
+        } else if (UserType.BRIGADE.equals(userType)) {
+            // 大队：周期内总量
+            this.value = itemSeizureStatsService.getBrigadeEffectiveSeizureCount(deptId, startTime, endTime);
         } else if (UserType.STATION.equals(userType)) {
             // 站点：周期内总量
             this.value = itemSeizureStatsService.getStationEffectiveSeizureCount(deptId, startTime, endTime);

airport-item/src/main/java/com/sundot/airport/item/service/portrait/ReferToPoliceCountIndicator.java

@@ -57,6 +57,9 @@ public class ReferToPoliceCountIndicator implements Indicator<Object> {
         } else if (UserType.DEPARTMENT.equals(userType)) {
             // 科室：周期内总量
             this.value = itemSeizureStatsService.getDepartmentReferToPoliceCount(deptId, startTime, endTime);
+        } else if (UserType.BRIGADE.equals(userType)) {
+            // 大队：周期内总量
+            this.value = itemSeizureStatsService.getBrigadeReferToPoliceCount(deptId, startTime, endTime);
         } else if (UserType.STATION.equals(userType)) {
             // 站点：周期内总量
             this.value = itemSeizureStatsService.getStationReferToPoliceCount(deptId, startTime, endTime);

airport-item/src/main/java/com/sundot/airport/item/service/portrait/WillfulConcealmentCountIndicator.java

@@ -57,6 +57,9 @@ public class WillfulConcealmentCountIndicator implements Indicator<Object> {
         } else if (UserType.DEPARTMENT.equals(userType)) {
             // 科室：周期内总量
             this.value = itemSeizureStatsService.getDepartmentWillfulConcealmentCount(deptId, startTime, endTime);
+        } else if (UserType.BRIGADE.equals(userType)) {
+            // 大队：周期内总量
+            this.value = itemSeizureStatsService.getBrigadeWillfulConcealmentCount(deptId, startTime, endTime);
         } else if (UserType.STATION.equals(userType)) {
             // 站点：周期内总量
             this.value = itemSeizureStatsService.getStationWillfulConcealmentCount(deptId, startTime, endTime);

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

@@ -125,6 +125,20 @@
           AND isr.process_status = '3' -- 已归档状态
     </select>
 
+    <!-- 组织有效查获总量 - 大队级别 -->
+    <select id="selectBrigadeEffectiveSeizureCount"
+            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
+        WHERE isr.inspect_brigade_id = #{brigadeId}
+          AND isr.seizure_time >= #{startTime}
+          AND isr.seizure_time &lt;= #{endTime}
+          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,
@@ -167,6 +181,21 @@
           AND isr.process_status = '3' -- 已归档状态
     </select>
 
+    <!-- 组织故意隐匿查获总量 - 大队级别 -->
+    <select id="selectBrigadeWillfulConcealmentCount"
+            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
+        WHERE isr.inspect_brigade_id = #{brigadeId}
+          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="selectStationWillfulConcealmentCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
         SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,
@@ -209,6 +238,20 @@
           AND isr.process_status = '3' -- 已归档状态
     </select>
 
+    <!-- 组织移交公安查获总量 - 大队级别 -->
+    <select id="selectBrigadeReferToPoliceCount" 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
+        WHERE isr.inspect_brigade_id = #{brigadeId}
+          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="selectStationReferToPoliceCount" resultType="com.sundot.airport.item.domain.portrait.SeizureStats">
         SELECT IFNULL(SUM(isi.quantity), 0) AS totalCount,