From 9ad699b5bcd60760f7f35175ce25507bcb42e3d0 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Tue, 31 Dec 2024 09:15:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjkf/xinke/main/service/DataAdjacentService.java  | 11 +++++++++++
 .../xinke/main/service/MaterialResultService.java     |  4 ++++
 2 files changed, 15 insertions(+)

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<BaseMapper<DataAdjacent>, D
         }
         return result;
      }
+
+    public List<Map<String, Object>> listStatistics(LambdaQueryWrapper<DataAdjacent> query) {
+        var data = this.list(query);
+        var result = new ArrayList<Map<String, Object>>();
+        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)) {