From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
index e2b3297..48a3c7b 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
@@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -63,16 +64,23 @@
}
IndItemEntity subItem = indItemService.getInfoByNo(s);
ItemTypeEnum itemType = ItemTypeEnum.getEumByCode(subItem.getItemType());
+ List<IndItemValueVO> vl = new ArrayList<>();
switch (itemType) {
case ATOM:
- valueMix.add(atomItemHandler.queryValue(subItem.getId()));
+ vl = atomItemHandler.queryValue(subItem.getId());
break;
case DER:
- valueMix.add(derItemHandler.queryValue(subItem.getId()));
+ vl = derItemHandler.queryValue(subItem.getId());
break;
default:
break;
}
+ if (!CollectionUtils.isEmpty(vl)) {
+ vl.forEach(vi -> {
+ vi.setItemNo(s);
+ });
+ }
+ valueMix.add(vl);
}
dataLength = valueMix.get(0).size();
--
Gitblit v1.9.3