From 28e168f05d3eb48223e69064188c6fce786442d4 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 12:02:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
index b7422a6..6db62e6 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
@@ -182,6 +182,25 @@
return "瀵煎叆瀹屾瘯" ;
}
+ /**
+ * 鎬昏繘搴�
+ * @return
+ */
+ @Override
+ public Hole selectHoleTotalProcess() {
+ return holeMapper.selectHoleTotalProcess();
+ }
+
+ /**
+ * 鍦哄湴杩涘害
+ * @return
+ */
+ @Override
+ public List<Hole> selectHoleProjectProcess() {
+ return holeMapper.selectHoleProjectProcess();
+ }
+
+
private String saveExcel(MultipartFile file) {
String filename = file.getOriginalFilename();
File dir = new File(fileSaveDir);
@@ -201,11 +220,12 @@
private List<Hole> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
reader.addHeaderAlias("閽诲瓟缂栧彿", "code");
- reader.addHeaderAlias("瀛斿彛楂樼▼", "elevation");
- reader.addHeaderAlias("璁捐瀛旀繁", "depth");
+ reader.addHeaderAlias("瀛斿彛楂樼▼(m)", "elevation");
+ reader.addHeaderAlias("璁捐瀛旀繁(m)", "depth");
reader.addHeaderAlias("閽诲瓟缁忓害", "longitude");
reader.addHeaderAlias("閽诲瓟绾害", "latitude");
- reader.addHeaderAlias("杩涘害", "pic1");
+ reader.addHeaderAlias("鎬昏繘灏�(m)", "footage");
+ reader.addHeaderAlias("宸插畬鎴愯繘灏�(m)", "footageCpl");
List<Hole> list = reader.readAll(Hole.class);
return list;
--
Gitblit v1.9.1