Merge remote-tracking branch 'origin/master'

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerRealtimeInterceptionController.java

@@ -7,6 +7,8 @@ import com.sundot.airport.common.annotation.Log;
 import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.ledger.domain.LedgerRealtimeInterception;
@@ -47,4 +49,16 @@ public class LedgerRealtimeInterceptionController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         return AjaxResult.success(service.getById(id));
     }
+
+    /**
+     * 实时质控拦截物品分布
+     *
+     * @param queryReq 查询参数
+     * @return AjaxResult
+     */
+    @PostMapping("/realtimeInterceptionItem")
+    public AjaxResult supervisionProblemPosition(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> result = service.realtimeInterceptionItem(queryReq);
+        return AjaxResult.success(result);
+    }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerSecurityTestController.java

@@ -51,7 +51,7 @@ public class LedgerSecurityTestController extends BaseController {
     }
 
     /**
-     * 物品分类（员工/小组/班组/部门）
+     * 安保测试物品分类
      *
      * @param queryReq 查询参数
      * @return AjaxResult
@@ -63,7 +63,7 @@ public class LedgerSecurityTestController extends BaseController {
     }
 
     /**
-     * 通过情况（员工/小组/班组/部门）
+     * 安保测试通过情况
      *
      * @param queryReq 查询参数
      * @return AjaxResult
@@ -75,7 +75,7 @@ public class LedgerSecurityTestController extends BaseController {
     }
 
     /**
-     * 区域情况（员工/小组/班组/部门）
+     * 安保测试区域情况
      *
      * @param queryReq 查询参数
      * @return AjaxResult

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerSupervisionProblemController.java

@@ -51,7 +51,7 @@ public class LedgerSupervisionProblemController extends BaseController {
     }
 
     /**
-     * 岗位情况（员工/小组/班组/部门）
+     * 各岗位监察问题分布
      *
      * @param queryReq 查询参数
      * @return AjaxResult

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/SeizeCategoryQuantityVO.java

@@ -15,9 +15,9 @@ public class SeizeCategoryQuantityVO implements Serializable {
     /**
      * 违规品类别名称（饼图名称）
      */
-    private String itemName;
+    private String categoryName;
     /**
      * 该类别总查获数量（饼图数值）
      */
-    private Integer itemNum;
+    private Integer categoryNum;
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerRealtimeInterceptionMapper.java

@@ -1,7 +1,10 @@
 package com.sundot.airport.ledger.mapper;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.ledger.domain.LedgerRealtimeInterception;
 
 /**
@@ -9,4 +12,6 @@ import com.sundot.airport.ledger.domain.LedgerRealtimeInterception;
  */
 public interface LedgerRealtimeInterceptionMapper extends BaseMapper<LedgerRealtimeInterception> {
     List<LedgerRealtimeInterception> selectList(LedgerRealtimeInterception query);
+
+    List<LedgerCommonResVO> realtimeInterceptionItem(LedgerCommonQueryReqVO query);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerRealtimeInterceptionService.java

@@ -1,10 +1,16 @@
 package com.sundot.airport.ledger.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.ledger.domain.LedgerRealtimeInterception;
 
 public interface ILedgerRealtimeInterceptionService extends IService<LedgerRealtimeInterception> {
     List<LedgerRealtimeInterception> selectList(LedgerRealtimeInterception query);
+
     int batchInsert(List<LedgerRealtimeInterception> list);
+
+    List<LedgerCommonResVO> realtimeInterceptionItem(LedgerCommonQueryReqVO query);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerRealtimeInterceptionServiceImpl.java

@@ -1,7 +1,10 @@
 package com.sundot.airport.ledger.service.impl;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.LedgerRealtimeInterception;
 import com.sundot.airport.ledger.mapper.LedgerRealtimeInterceptionMapper;
@@ -32,4 +35,9 @@ public class LedgerRealtimeInterceptionServiceImpl extends ServiceImpl<LedgerRea
         saveBatch(list);
         return list.size();
     }
+
+    @Override
+    public List<LedgerCommonResVO> realtimeInterceptionItem(LedgerCommonQueryReqVO query) {
+        return mapper.realtimeInterceptionItem(query);
+    }
 }

airport-ledger/src/main/resources/mapper/ledger/LedgerRealtimeInterceptionMapper.xml

@@ -91,4 +91,23 @@
         ORDER BY id DESC
     </select>
 
+    <select id="realtimeInterceptionItem"
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
+        select item_name name,
+        count(1) total
+        from ledger_realtime_interception
+        where del_flag = '0'
+        <if test="deptId != null">and dept_id = #{deptId}</if>
+        <if test="teamId != null">and team_id = #{teamId}</if>
+        <if test="groupId != null">and group_id = #{groupId}</if>
+        <if test="userId != null">and inspector_id = #{userId}</if>
+        <if test="startDate != null and endDate != null">
+            and (record_date >= #{startDate}
+            and record_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+        group by item_name
+        order by total desc
+    </select>
+
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -188,7 +188,7 @@
     </select>
 
     <select id="countSeizeSubjectCategoryQuantity" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO">
-        SELECT item_name AS itemName, IFNULL(SUM(item_quantity), 0) AS itemNum
+        SELECT item_category AS categoryName, IFNULL(SUM(item_quantity), 0) AS categoryNum
         FROM ledger_seizure_stats
         WHERE
             del_flag = '0'
@@ -198,9 +198,9 @@
             <if test="teamId != null">AND team_id = #{teamId}</if>
             <if test="groupId != null">AND group_id = #{groupId}</if>
             <!-- 过滤空类别，避免脏数据 -->
-            AND item_name IS NOT NULL
-            AND item_name != ''
-        GROUP BY item_name
+            AND item_category IS NOT NULL
+            AND item_category != ''
+        GROUP BY item_category
         ORDER BY categoryNum DESC
     </select>