diff --git a/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java b/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java index 82d4a9f..a96d1b8 100644 --- a/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java +++ b/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java @@ -1,6 +1,7 @@ package mjkf.xinke.main.service; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; import mjkf.xinke.main.model.db.DataAdjacent; @@ -92,5 +93,15 @@ public class DataAdjacentService extends DataService, D } return result; } + + public List> listStatistics(LambdaQueryWrapper query) { + var data = this.list(query); + var result = new ArrayList>(); + for (var item: data) { + var obj = JSONUtil.parseObj(item); + result.add(obj); + } + return result; + } } diff --git a/src/main/java/mjkf/xinke/main/service/MaterialResultService.java b/src/main/java/mjkf/xinke/main/service/MaterialResultService.java index 6cf5ffc..b358053 100644 --- a/src/main/java/mjkf/xinke/main/service/MaterialResultService.java +++ b/src/main/java/mjkf/xinke/main/service/MaterialResultService.java @@ -33,6 +33,8 @@ public class MaterialResultService { DataNetworkService dataNetworkService; @Resource AsphaltModifierService asphaltModifierService; + @Resource + DataAdjacentService dataAdjacentService; /** * 基础查询 @@ -136,6 +138,8 @@ public class MaterialResultService { service = dataFujianService; } else if (type.equals(MaterialTaskType.ASPHALT_MODIFIER)) { service = asphaltModifierService; + } else if (type.equals(MaterialTaskType.OTHER)) { + service = dataAdjacentService; } else if (MaterialTaskType.isLocalMaterial(type)) { service = localMaterialService; } else if (MaterialTaskType.isNetworkPrice(type)) {