From f29c8786807015d78b9be8a33397f69478d92a76 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 12 七月 2025 16:52:27 +0800
Subject: [PATCH] 1.设备优化 2.配煤计算器
---
main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java b/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
index e81edb6..cfb3036 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Data
public class PendingInventoryDto extends PendingInventory {
@@ -13,36 +14,27 @@
@JsonProperty("pId")
private Long pId;
- /**
- * 姝ｅ紡搴搃d
- */
@JsonProperty("officialId")
- private Long officialId;
+ private Long officialId;//姝ｅ紡搴搃d
- private List<Map<String, String>> fieldValue;
+ private List<Map<String, String>> fieldValue;//鐓ょ鏂规瀛楁list
- /**
- * 瀛楁鍊�
- */
- private String coalValue;
- /**
- * 瀛楁
- */
- private String fields;
- /**
- * 瀛楁鍚�
- */
- private String fieldName;
+ private String coalValue;//鐓ょ鏂规瀛楁鍊�
- /**
- * 瀛楁鍚�
- */
- private Integer type;
+ private String fields;//鐓ょ鏂规瀛楁
- /**
- * 鐓ょ
- */
- private String coal;
+ private String fieldName; //鐓ょ鏂规瀛楁鍚�
- private String registrant;
+ private Integer type; //绫诲瀷
+
+ private String coal;//鐓ょ
+
+ private String registrant;//鐧昏浜�
+
+ private String searchAll;//鎼滅储
+
+ private List<Map<String, Object>> coalResultList;//閰嶇叅璁＄畻鍣ㄧ叅绉嶄俊鎭痩ist
+
+ private List<Map<String, Object>> fieldsResultList;//閰嶇叅璁＄畻鍣ㄦ柟妗堝瓧娈典俊鎭痩ist
+
}
--
Gitblit v1.9.3