潘志宝
2025-01-16 a9f305fc48e6b1d8d8fd7caf9e04598de52dcfd0
计算指标查询异常修复
已修改3个文件
24 ■■■■ 文件已修改
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/DerItemHandler.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
@@ -31,9 +32,11 @@
        try {
            QuerySourceValueDTO queryDto = indSqlUtils.getAtomSql(itemId);
            result = indItemValueService.getSourceValue(queryDto);
            result.forEach(item -> {
                item.setItemNo(queryDto.getItemNo());
            });
            if (!CollectionUtils.isEmpty(result)) {
                result.forEach(item -> {
                    item.setItemNo(queryDto.getItemNo());
                });
            }
        } catch (Exception ex) {
            ex.printStackTrace();
        }
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();
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/DerItemHandler.java
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
@@ -31,7 +32,7 @@
        List<IndItemValueVO> result = new ArrayList<IndItemValueVO>();
        try {
            QuerySourceValueDTO queryDto = indSqlUtils.getDerSql(itemId);
            return indItemValueService.getSourceValue(queryDto);
            result = indItemValueService.getSourceValue(queryDto);
        } catch (Exception ex) {
            ex.printStackTrace();
        }