查获统计+查获大屏

airport-common/src/main/java/com/sundot/airport/common/core/domain/BaseLargeScreenQueryParamDto.java

@@ -95,4 +95,9 @@ public class BaseLargeScreenQueryParamDto implements Serializable {
     @ApiModelProperty("班组id")
     private Long inspectTeamId;
 
+    /**
+     * 大队id
+     */
+    @ApiModelProperty("大队id")
+    private Long inspectBrigadeId;
 }

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

@@ -63,6 +63,14 @@ public interface ItemLargeScreenMapper {
     public ItemLargeScreenTotalSomeDto getTotalSome(BaseLargeScreenQueryParamDto dto);
 
     /**
+     * 查获排名-按大队
+     *
+     * @param dto 大屏查询参数
+     * @return 查获排名-按大队
+     */
+    public List<ItemLargeScreenCommonDto> rankByBrigade(BaseLargeScreenQueryParamDto dto);
+
+    /**
      * 查获排名-按科室
      *
      * @param dto 大屏查询参数

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

@@ -65,7 +65,7 @@ public interface ItemLargeScreenService {
      * 查获排名
      *
      * @param dto  大屏查询参数
-     * @param type 类型:1=按科室;2=按班组;3=按个人
+     * @param type 类型:1=按科室;2=按班组;3=按个人;4=按大队
      * @return 查获排名
      */
     public List<ItemLargeScreenCommonDto> rank(BaseLargeScreenQueryParamDto dto, int type);

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

@@ -125,7 +125,7 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
      * 查获排名
      *
      * @param dto  大屏查询参数
-     * @param type 类型:1=按科室;2=按班组;3=按个人
+     * @param type 类型:1=按科室;2=按班组;3=按个人;4=按大队
      * @return 查获排名
      */
     @Override
@@ -153,6 +153,9 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                     }
                 }
                 break;
+            case 4:
+                result = itemLargeScreenMapper.rankByBrigade(dto);
+                break;
             default:
                 return Collections.emptyList();
         }

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

@@ -15,7 +15,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice == '1' or isPolice == 1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal == 1">and isi.is_active_concealment = 1</if>
     </select>
@@ -63,7 +65,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         and isr.process_status=3
         order by isr.seizure_time desc
     </select>
@@ -110,7 +114,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         order by isr.seizure_time desc
     </select>
 
@@ -139,7 +145,9 @@
         <if test="levelType == 2  and categoryCode != null and  categoryCode != ''">
             and isi.category_code_one = #{categoryCode}
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by
@@ -167,7 +175,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by isr.check_method,
@@ -189,7 +199,38 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.attendance_team_id = #{inspectTeamId}</if>
+    </select>
+
+    <!--查获排名-按大队-->
+    <select id="rankByBrigade" resultType="com.sundot.airport.item.domain.ItemLargeScreenCommonDto">
+        select isr.inspect_brigade_id id,
+        isr.inspect_brigade_name name,
+        sum(isi.quantity) total
+        from item_seizure_record isr
+        left join item_seizure_items isi on isr.id = isi.record_id
+        where isr.process_status=3
+        <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
+        <if test="startDate != null and endDate != null">
+            and (isr.seizure_time >= #{startDate}
+            and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
+        </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
+        <if test="categoryCodeOne != null and  categoryCodeOne != ''">
+            and isi.category_code_one = #{categoryCodeOne}
+        </if>
+        <if test="categoryCodeTwo != null and  categoryCodeTwo != ''">
+            and isi.category_code_two = #{categoryCodeTwo}
+        </if>
+        <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
+        <if test="isConceal=='1' or isConceal==1 ">and isi.is_active_concealment = 1</if>
+        group by isr.inspect_brigade_id,
+        isr.inspect_brigade_name
+        order by total desc
     </select>
 
     <!--查获排名-按科室-->
@@ -205,7 +246,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -232,7 +275,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -259,6 +304,7 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
@@ -343,7 +389,9 @@
         <if test="categoryCodeTwo != null and  categoryCodeTwo != ''">
             and isi.category_code_two = #{categoryCodeTwo}
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or  isConceal==1 ">and isi.is_active_concealment = 1</if>
         group by hours.hour
@@ -361,7 +409,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -389,7 +439,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by isi.check_position_code_one,
@@ -414,7 +466,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         group by isr.regional_code,
         isr.regional_name,
         isi.category_code_one,
@@ -441,7 +495,9 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         <if test="levelType == 2 and positionCode!=null and positionCode!=''">and isi.check_position_code_one =