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

@@ -10,6 +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.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;
@@ -47,4 +49,41 @@ public class LedgerSecurityTestController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         return AjaxResult.success(service.getById(id));
     }
+
+    /**
+     * 安保测试物品分类
+     *
+     * @param queryReq 查询参数
+     * @return AjaxResult
+     */
+    @PostMapping("/securityTestItemClassification")
+    public AjaxResult securityTestItemClassification(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> result = service.securityTestItemClassification(queryReq);
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 安保测试通过情况
+     *
+     * @param queryReq 查询参数
+     * @return AjaxResult
+     */
+    @PostMapping("/securityTestPassingStatus")
+    public AjaxResult securityTestPassingStatus(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> result = service.securityTestPassingStatus(queryReq);
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 安保测试区域情况
+     *
+     * @param queryReq 查询参数
+     * @return AjaxResult
+     */
+    @PostMapping("/securityTestRegion")
+    public AjaxResult securityTestRegion(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> result = service.securityTestRegion(queryReq);
+        return AjaxResult.success(result);
+    }
+
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerSupervisionProblemController.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.LedgerSupervisionProblem;
@@ -47,4 +49,16 @@ public class LedgerSupervisionProblemController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         return AjaxResult.success(service.getById(id));
     }
+
+    /**
+     * 各岗位监察问题分布
+     *
+     * @param queryReq 查询参数
+     * @return AjaxResult
+     */
+    @PostMapping("/supervisionProblemPosition")
+    public AjaxResult supervisionProblemPosition(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<LedgerCommonResVO> result = service.supervisionProblemPosition(queryReq);
+        return AjaxResult.success(result);
+    }
 }

airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonQueryReqVO.java

@@ -0,0 +1,50 @@
+package com.sundot.airport.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 台账统计查询 Req Entity
+ */
+@Data
+public class LedgerCommonQueryReqVO implements Serializable {
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 班组ID
+     */
+    private Long teamId;
+
+    /**
+     * 小组ID
+     */
+    private Long groupId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+}

airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonResVO.java

@@ -0,0 +1,69 @@
+package com.sundot.airport.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 台账统计查询 Res Entity
+ */
+@Data
+public class LedgerCommonResVO implements Serializable {
+
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date recordDate;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 数量
+     */
+    private BigDecimal total;
+
+    /**
+     * 比例
+     */
+    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/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/mapper/LedgerSecurityTestMapper.java

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

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerSupervisionProblemMapper.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.LedgerSupervisionProblem;
 
 /**
@@ -9,4 +12,6 @@ import com.sundot.airport.ledger.domain.LedgerSupervisionProblem;
  */
 public interface LedgerSupervisionProblemMapper extends BaseMapper<LedgerSupervisionProblem> {
     List<LedgerSupervisionProblem> selectList(LedgerSupervisionProblem query);
+
+    List<LedgerCommonResVO> supervisionProblemPosition(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/ILedgerSecurityTestService.java

@@ -1,10 +1,20 @@
 package com.sundot.airport.ledger.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.ledger.domain.LedgerSecurityTest;
+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<LedgerCommonResVO> securityTestItemClassification(LedgerCommonQueryReqVO queryReq);
+
+    List<LedgerCommonResVO> securityTestPassingStatus(LedgerCommonQueryReqVO queryReq);
+
+    List<LedgerCommonResVO> securityTestRegion(LedgerCommonQueryReqVO queryReq);
 }

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

@@ -1,7 +1,10 @@
 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.LedgerSupervisionProblem;
 
 /**
@@ -9,5 +12,8 @@ import com.sundot.airport.ledger.domain.LedgerSupervisionProblem;
  */
 public interface ILedgerSupervisionProblemService extends IService<LedgerSupervisionProblem> {
     List<LedgerSupervisionProblem> selectList(LedgerSupervisionProblem query);
+
     int batchInsert(List<LedgerSupervisionProblem> list);
+
+    List<LedgerCommonResVO> supervisionProblemPosition(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/java/com/sundot/airport/ledger/service/impl/LedgerSecurityTestServiceImpl.java

@@ -1,9 +1,12 @@
 package com.sundot.airport.ledger.service.impl;
 
 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.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;
@@ -32,4 +35,19 @@ public class LedgerSecurityTestServiceImpl extends ServiceImpl<LedgerSecurityTes
         saveBatch(list);
         return list.size();
     }
+
+    @Override
+    public List<LedgerCommonResVO> securityTestItemClassification(LedgerCommonQueryReqVO queryReq) {
+        return mapper.securityTestItemClassification(queryReq);
+    }
+
+    @Override
+    public List<LedgerCommonResVO> securityTestPassingStatus(LedgerCommonQueryReqVO queryReq) {
+        return mapper.securityTestPassingStatus(queryReq);
+    }
+
+    @Override
+    public List<LedgerCommonResVO> securityTestRegion(LedgerCommonQueryReqVO queryReq) {
+        return mapper.securityTestRegion(queryReq);
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSupervisionProblemServiceImpl.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.LedgerSupervisionProblem;
 import com.sundot.airport.ledger.mapper.LedgerSupervisionProblemMapper;
@@ -32,4 +35,9 @@ public class LedgerSupervisionProblemServiceImpl extends ServiceImpl<LedgerSuper
         saveBatch(list);
         return list.size();
     }
+
+    @Override
+    public List<LedgerCommonResVO> supervisionProblemPosition(LedgerCommonQueryReqVO query) {
+        return mapper.supervisionProblemPosition(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/LedgerSecurityTestMapper.xml

@@ -69,4 +69,61 @@
         ORDER BY id DESC
     </select>
 
+    <select id="securityTestItemClassification"
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
+        select problem_desc name,
+        count(1) total
+        from ledger_security_test
+        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 tested_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 problem_desc
+        order by total desc
+    </select>
+
+    <select id="securityTestPassingStatus"
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
+        select test_result name,
+        count(1) total
+        from ledger_security_test
+        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 tested_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 test_result
+        order by total desc
+    </select>
+
+    <select id="securityTestRegion"
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
+        select region name,
+        count(1) total
+        from ledger_security_test
+        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 tested_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 region
+        order by total desc
+    </select>
+
 </mapper>

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

@@ -78,4 +78,24 @@
         ORDER BY record_date DESC, id DESC
     </select>
 
+    <select id="supervisionProblemPosition"
+            parameterType="com.sundot.airport.common.dto.LedgerCommonQueryReqVO"
+            resultType="com.sundot.airport.common.dto.LedgerCommonResVO">
+        select position_id id,
+        position name,
+        count(1) total
+        from ledger_supervision_problem
+        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 inspected_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 position_id, position
+        order by total desc
+    </select>
+
 </mapper>