From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
index a742603..7883ea5 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
@@ -74,10 +74,14 @@
*/
protected List<Object> buildDeviceInfo() {
List<Object> deviceInfos = new ArrayList<>();
- for (var device : devices) {
+ // 按照设备类型排序
+ var sortedDevices = devices.stream()
+ .sorted(Comparator.comparing(device -> device.getType() != null ? device.getType().ordinal() : Integer.MAX_VALUE))
+ .collect(Collectors.toList());
+ for (var device : sortedDevices) {
JSONObject deviceInfo = new JSONObject();
deviceInfo.put("设备类型", device.getType().getDesc());
- deviceInfo.put("设备编号", device.getName());
+ deviceInfo.put("设备编号", device.getManufacturerNumber());
deviceInfo.put("设备租赁单位", device.getProperties().get("工程起重机械租赁单位"));
deviceInfo.put("设备使用单位", device.getProperties().get("使用单位"));
deviceInfo.put("安拆单位", device.getProperties().get("工程起重机械安拆单位"));
@@ -100,7 +104,7 @@
int totalErrors = Arrays.stream(node.getData().getTotalErrorCounts()).sum();
result.put("隐患数量", totalErrors);
List<Object> errorInfos = new ArrayList<>();
- for (int i = 3; i>=0 ; i--) {
+ for (int i = 0; i<4 ; i++) {
var level = ErrorLevel.values()[i];
var count = node.getData().getTotalErrorCounts()[i];
var info = new JSONObject();
@@ -181,7 +185,7 @@
var problem = record.getProblem();
JSONObject subItem = new JSONObject();
if(record.getDevice() != null)
- subItem.put("设备编号", record.getDevice().getName());
+ subItem.put("设备编号", record.getDevice().getManufacturerNumber());
subItem.put("隐患等级", record.getLevel().getDesc());
subItem.put("问题部位", record.getProblemPart());
subItem.put("问题备注", trimText(StringUtils.hasText(record.getRemark()) ? record.getRemark() : problem.getDescription()));
@@ -191,13 +195,13 @@
if(!CollectionUtils.isEmpty(problem.getSpecificTerms())){
StringBuilder sb = new StringBuilder();
- var terms = CollectionUtils.isEmpty(record.getSpecificTermIndexes())
- ? problem.getSpecificTerms()
- : record.getSpecificTermIndexes().stream()
+ var terms = CollectionUtils.isEmpty(record.getSpecificTermIndexes())
+ ? problem.getSpecificTerms()
+ : record.getSpecificTermIndexes().stream()
.filter(idx -> idx < problem.getSpecificTerms().size())
.map(problem.getSpecificTerms()::get)
.collect(Collectors.toList());
-
+
for(int i = 0; i < terms.size(); i++) {
sb.append(terms.get(i));
if(i < terms.size() - 1) {
--
Gitblit v1.7.1