新增故障统计增删改查功能

als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultStatisticsController.java

@@ -44,15 +44,24 @@ public class FaultStatisticsController extends BaseController {
     @Resource
     private IFaultStatisticsService faultStatisticsService;
 
-/**
- * 查询故障统计列表
- */
-@SaCheckPermission("als:faultStatistics:list")
-@GetMapping("/list")
+    /**
+     * 查询故障统计列表
+     */
+    @SaCheckPermission("als:faultStatistics:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultStatisticsVo>> list(FaultStatisticsBo faultStatisticsBo) {
         return CommonResult.success(faultStatisticsService.selectPage(faultStatisticsBo));
     }
 
+    /**
+     * 查询故障统计列表
+     */
+    @SaCheckPermission("als:faultStatistics:list")
+    @GetMapping("/listAll")
+    public CommonResult<List<FaultStatisticsVo>> listAll(FaultStatisticsBo faultStatisticsBo) {
+        return CommonResult.success(faultStatisticsService.selectList(faultStatisticsBo));
+    }
+
     /**
      * 导出故障统计列表
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultStatisticsBo.java

@@ -352,4 +352,8 @@ public class FaultStatisticsBo extends BaseEntity{
     private String remarks;
 
 
+    /**
+     * 去重字段
+     */
+    private String distinctField;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java

@@ -61,11 +61,33 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
         (faultStatisticsBo.getStatisticsDate()));
         queryWrapper.and(FAULT_STATISTICS.WAR_ZONE.eq
         (faultStatisticsBo.getWarZone()));
+
+        queryWrapper.and(FAULT_STATISTICS.GROUPS.eq
+            (faultStatisticsBo.getGroups()));
         queryWrapper.and(FAULT_STATISTICS.MAJOR.eq
         (faultStatisticsBo.getMajor()));
-
-        if(faultStatisticsBo.getStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null){
-
+        queryWrapper.and(FAULT_STATISTICS.AIRCRAFT_MODEL.eq
+            (faultStatisticsBo.getAircraftModel()));
+        queryWrapper.and(FAULT_STATISTICS.AIRCRAFT_NUM.eq
+            (faultStatisticsBo.getAircraftNum()));
+        queryWrapper.and(FAULT_STATISTICS.FAULTY_PARTS_NAME.eq
+            (faultStatisticsBo.getFaultyPartsName()));
+
+        if(faultStatisticsBo.getStartStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null){
+            queryWrapper.between("statistics_date", faultStatisticsBo.getStartStatisticsDate(), faultStatisticsBo.getEndStatisticsDate());
+        }
+        if(faultStatisticsBo.getDistinctField() != null){
+            if(faultStatisticsBo.getDistinctField().equals("groups")){
+                queryWrapper.select("DISTINCT groups"); // 指定去重字段
+            }else if(faultStatisticsBo.getDistinctField().equals("major")){
+                queryWrapper.select("DISTINCT major");
+            }else if(faultStatisticsBo.getDistinctField().equals("aircraft_model")){
+                queryWrapper.select("DISTINCT aircraft_model");
+            }else if(faultStatisticsBo.getDistinctField().equals("aircraft_num")){
+                queryWrapper.select("DISTINCT aircraft_num");
+            }else if(faultStatisticsBo.getDistinctField().equals("faulty_parts_name")){
+                queryWrapper.select("DISTINCT faulty_parts_name");
+            }
         }
 
         return queryWrapper;