Browse Source

维保单中获取前5的数据

黄远 5 years ago
parent
commit
3ad122ba00

+ 5 - 0
lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/request/CommonRequest.java

@@ -39,6 +39,11 @@ public class CommonRequest implements Serializable {
      */
     private Long mtCompanyId;
 
+    /**
+     * 5 - all
+     */
+    private String numFlag;
+
     public LocalDateTime getStartTimeDate() {
         if (startTimeDate != null) {
             return startTimeDate;

+ 0 - 4
lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/request/EmergencyRepairDataRequest.java

@@ -21,8 +21,4 @@ public class EmergencyRepairDataRequest extends CommonRequest {
      */
     private Integer status;
 
-    /**
-     * 5 - all
-     */
-    private String numFlag;
 }

+ 11 - 7
lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/MaintenanceDataService.java

@@ -92,13 +92,17 @@ public class MaintenanceDataService {
                     .collect(Collectors.groupingBy(MaintenanceDataModel::getProjectName, Collectors.counting()));
             //通过超期台量倒序排列
             allProjectNameToBeyondNum = DataStatisticsUtil.sortByValue(allProjectNameToBeyondNum, true);
-            //获取前5的数据
-            AtomicInteger i = new AtomicInteger(1);
-            allProjectNameToBeyondNum.forEach((key, value) -> {
-                if (i.getAndIncrement() <= 5) {
-                    projectNameToBeyondNum.put(key, value);
-                }
-            });
+            if ("five".equals(commonRequest.getNumFlag())) {
+                //获取前5的数据
+                AtomicInteger i = new AtomicInteger(1);
+                allProjectNameToBeyondNum.forEach((key, value) -> {
+                    if (i.getAndIncrement() <= 5) {
+                        projectNameToBeyondNum.put(key, value);
+                    }
+                });
+            } else {
+                allProjectNameToBeyondNum.forEach(projectNameToBeyondNum::put);
+            }
         }
         return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(projectNameToBeyondNum), ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }