PC端-查获总数+移交公安+隐匿携带(不需要完成审核)

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

@@ -85,6 +85,16 @@ public class ItemLargeScreenController extends BaseController {
     }
 
     /**
+     * PC端-查获总数+移交公安+隐匿携带(不需要完成审核)
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/getPcTotalSome")
+    public AjaxResult getPcTotalSome(BaseLargeScreenQueryParamDto dto) {
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getPcTotalSome(dto);
+        return success(result);
+    }
+
+    /**
      * 查获排名
      */
     @PreAuthorize("@ss.hasPermi('item:record:list')")

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

@@ -67,6 +67,14 @@ public interface ItemLargeScreenMapper {
     public ItemLargeScreenTotalSomeDto getTotalSome(BaseLargeScreenQueryParamDto dto);
 
     /**
+     * 查获总数量+移交公安数量+故意隐匿数量
+     *
+     * @param dto 大屏查询参数
+     * @return 查获总数量+移交公安数量+故意隐匿数量
+     */
+    public ItemLargeScreenTotalSomeDto getPcTotalSome(BaseLargeScreenQueryParamDto dto);
+
+    /**
      * 查获排名-按大队
      *
      * @param dto 大屏查询参数

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

@@ -63,6 +63,14 @@ public interface ItemLargeScreenService {
     ItemLargeScreenTotalSomeDto getAppTotalSome(BaseLargeScreenQueryParamDto dto);
 
     /**
+     * pc端查获总数量+移交公安数量+故意隐匿数量
+     *
+     * @param dto 大屏查询参数
+     * @return 查获总数量+移交公安数量+故意隐匿数量
+     */
+    ItemLargeScreenTotalSomeDto getPcTotalSome(BaseLargeScreenQueryParamDto dto);
+
+    /**
      * 查获排名
      *
      * @param dto  大屏查询参数

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

@@ -142,6 +142,17 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
     }
 
     /**
+     * pc端查获总数量+移交公安数量+故意隐匿数量(不需要完成审核)
+     *
+     * @param dto 大屏查询参数
+     * @return 查获总数量+移交公安数量+故意隐匿数量
+     */
+    @Override
+    public ItemLargeScreenTotalSomeDto getPcTotalSome(BaseLargeScreenQueryParamDto dto) {
+        return itemLargeScreenMapper.getPcTotalSome(dto);
+    }
+
+    /**
      * 查获排名
      *
      * @param dto  大屏查询参数

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

@@ -211,6 +211,25 @@
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
     </select>
 
+    <!--查获总数量+移交公安数量+故意隐匿数量 不只查审批通过的-->
+    <select id="getPcTotalSome" resultType="com.sundot.airport.item.domain.ItemLargeScreenTotalSomeDto">
+        select ifnull(sum(isi.quantity), 0) total,
+        ifnull(sum(case when isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE' then isi.quantity else 0 end),
+        0) as policeTotal,
+        ifnull(sum(case when isi.is_active_concealment = 1 then isi.quantity else 0 end), 0) as concealTotal
+        from item_seizure_record isr
+        left join item_seizure_items isi on isr.id = isi.record_id
+        where 1=1
+        <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>
+    </select>
+
     <!--查获排名-按大队-->
     <select id="rankByBrigade" resultType="com.sundot.airport.item.domain.ItemLargeScreenCommonDto">
         select isr.inspect_brigade_id id,