安保测试统计

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

@@ -10,8 +10,8 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.ledger.domain.LedgerSecurityTest;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.ledger.service.ILedgerSecurityTestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,8 +57,8 @@ public class LedgerSecurityTestController extends BaseController {
      * @return AjaxResult
      */
     @PostMapping("/securityTestItemClassification")
-    public AjaxResult securityTestItemClassification(@RequestBody LedgerSecurityTestQueryReqVO queryReq) {
-        List<LedgerSecurityTestResVO> seizureQuantityList = service.securityTestItemClassification(queryReq);
+    public AjaxResult securityTestItemClassification(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> seizureQuantityList = service.securityTestItemClassification(queryReq);
         return AjaxResult.success(seizureQuantityList);
     }
 
@@ -69,8 +69,8 @@ public class LedgerSecurityTestController extends BaseController {
      * @return AjaxResult
      */
     @PostMapping("/securityTestPassingStatus")
-    public AjaxResult securityTestPassingStatus(@RequestBody LedgerSecurityTestQueryReqVO queryReq) {
-        List<LedgerSecurityTestResVO> seizureQuantityList = service.securityTestPassingStatus(queryReq);
+    public AjaxResult securityTestPassingStatus(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> seizureQuantityList = service.securityTestPassingStatus(queryReq);
         return AjaxResult.success(seizureQuantityList);
     }
 
@@ -81,8 +81,8 @@ public class LedgerSecurityTestController extends BaseController {
      * @return AjaxResult
      */
     @PostMapping("/securityTestRegion")
-    public AjaxResult securityTestRegion(@RequestBody LedgerSecurityTestQueryReqVO queryReq) {
-        List<LedgerSecurityTestResVO> seizureQuantityList = service.securityTestRegion(queryReq);
+    public AjaxResult securityTestRegion(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> seizureQuantityList = service.securityTestRegion(queryReq);
         return AjaxResult.success(seizureQuantityList);
     }
 

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

@@ -1,4 +1,4 @@
-package com.sundot.airport.ledger.domain.vo;
+package com.sundot.airport.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -8,11 +8,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 安保测试记录 统计查询 Req Entity
- *
+ * 台账统计查询 Req Entity
  */
 @Data
-public class LedgerSecurityTestQueryReqVO implements Serializable {
+public class LedgerCommonQueryReqVO implements Serializable {
 
     /**
      * 部门ID

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

@@ -1,4 +1,4 @@
-package com.sundot.airport.ledger.domain.vo;
+package com.sundot.airport.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -9,10 +9,10 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 安保测试记录 统计查询 Req Entity
+ * 台账统计查询 Res Entity
  */
 @Data
-public class LedgerSecurityTestResVO implements Serializable {
+public class LedgerCommonResVO implements Serializable {
 
     /**
      * 日期
@@ -39,11 +39,31 @@ public class LedgerSecurityTestResVO implements Serializable {
     /**
      * 数量
      */
-    private Integer quantity;
+    private BigDecimal total;
 
     /**
      * 比例
      */
-    private BigDecimal proportion;
+    private BigDecimal scale;
+
+    /**
+     * 比例描述
+     */
+    private String scaleDesc;
+
+    /**
+     * 排名
+     */
+    private Integer ranking;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 描述
+     */
+    private String desc;
 
 }

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

@@ -4,8 +4,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.LedgerSecurityTest;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 
 /**
  * 安保测试记录Mapper接口
@@ -13,9 +13,9 @@ import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO;
 public interface LedgerSecurityTestMapper extends BaseMapper<LedgerSecurityTest> {
     List<LedgerSecurityTest> selectList(LedgerSecurityTest query);
 
-    List<LedgerSecurityTestResVO> securityTestItemClassification(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestItemClassification(LedgerCommonQueryReqVO queryReq);
 
-    List<LedgerSecurityTestResVO> securityTestPassingStatus(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestPassingStatus(LedgerCommonQueryReqVO queryReq);
 
-    List<LedgerSecurityTestResVO> securityTestRegion(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestRegion(LedgerCommonQueryReqVO queryReq);
 }

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

@@ -4,17 +4,17 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.ledger.domain.LedgerSecurityTest;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 
 public interface ILedgerSecurityTestService extends IService<LedgerSecurityTest> {
     List<LedgerSecurityTest> selectList(LedgerSecurityTest query);
 
     int batchInsert(List<LedgerSecurityTest> list);
 
-    List<LedgerSecurityTestResVO> securityTestItemClassification(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestItemClassification(LedgerCommonQueryReqVO queryReq);
 
-    List<LedgerSecurityTestResVO> securityTestPassingStatus(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestPassingStatus(LedgerCommonQueryReqVO queryReq);
 
-    List<LedgerSecurityTestResVO> securityTestRegion(LedgerSecurityTestQueryReqVO queryReq);
+    List<LedgerCommonResVO> securityTestRegion(LedgerCommonQueryReqVO queryReq);
 }

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

@@ -5,8 +5,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.LedgerSecurityTest;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO;
-import com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO;
+import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.common.dto.LedgerCommonResVO;
 import com.sundot.airport.ledger.mapper.LedgerSecurityTestMapper;
 import com.sundot.airport.ledger.service.ILedgerSecurityTestService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,17 +37,17 @@ public class LedgerSecurityTestServiceImpl extends ServiceImpl<LedgerSecurityTes
     }
 
     @Override
-    public List<LedgerSecurityTestResVO> securityTestItemClassification(LedgerSecurityTestQueryReqVO queryReq) {
+    public List<LedgerCommonResVO> securityTestItemClassification(LedgerCommonQueryReqVO queryReq) {
         return this.baseMapper.securityTestItemClassification(queryReq);
     }
 
     @Override
-    public List<LedgerSecurityTestResVO> securityTestPassingStatus(LedgerSecurityTestQueryReqVO queryReq) {
+    public List<LedgerCommonResVO> securityTestPassingStatus(LedgerCommonQueryReqVO queryReq) {
         return this.baseMapper.securityTestPassingStatus(queryReq);
     }
 
     @Override
-    public List<LedgerSecurityTestResVO> securityTestRegion(LedgerSecurityTestQueryReqVO queryReq) {
+    public List<LedgerCommonResVO> securityTestRegion(LedgerCommonQueryReqVO queryReq) {
         return this.baseMapper.securityTestRegion(queryReq);
     }
 }

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

@@ -70,10 +70,10 @@
     </select>
 
     <select id="securityTestItemClassification"
-            parameterType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO"
-            resultType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO">
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
         select problem_desc name,
-        count(1) quantity
+        count(1) total
         from ledger_security_test
         where del_flag = '0'
         <if test="deptId != null">and dept_id = #{deptId}</if>
@@ -89,10 +89,10 @@
     </select>
 
     <select id="securityTestPassingStatus"
-            parameterType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO"
-            resultType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO">
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
         select test_result name,
-        count(1) quantity
+        count(1) total
         from ledger_security_test
         where del_flag = '0'
         <if test="deptId != null">and dept_id = #{deptId}</if>
@@ -108,10 +108,10 @@
     </select>
 
     <select id="securityTestRegion"
-            parameterType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestQueryReqVO"
-            resultType="com.sundot.airport.ledger.domain.vo.LedgerSecurityTestResVO">
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
         select region name,
-        count(1) quantity
+        count(1) total
         from ledger_security_test
         where del_flag = '0'
         <if test="deptId != null">and dept_id = #{deptId}</if>