From 1b004047f00cc846924209051ee654619c56a249 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 06 十二月 2023 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
index 19d0ea5..2ad0f8b 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
@@ -345,4 +345,20 @@
calendar.add(Calendar.MINUTE,amount);
return calendar.getTime();
}
+ @Override
+ public Map<String, Object> materialInfo() {
+ List<MaterialThingDto> materialThingDtos1 = pipeInfoMapper.materialInfo();
+ List<MaterialThingDto> materialThingDtos2 = pipeInfoMapper.materialInfoTwo();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("materialThingDtos1",materialThingDtos1);
+ map.put("materialThingDtos2",materialThingDtos2);
+ return map;
+ }
+
+ @Override
+ public List<MaterialThingNumDto> materialNumInfo() {
+ List<MaterialThingNumDto> materialThingNumDtos = pipeInfoMapper.materialNumInfo();
+
+ return materialThingNumDtos;
+ }
}
--
Gitblit v1.9.3