From 502a46d9f79f3a2e6ba8bf8c90b71c0c8ebf4815 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 13 Jun 2024 09:24:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java
index 927ca3d..f9df837 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java
@@ -42,6 +42,7 @@
private IDsmSpgSpprmpService dsmSpgSpprmpService;
@Override
+ @Transactional
public void importDbPersonData(List<DbExcel> data, String resGuid,String ch) {
//获取行政区划
@@ -61,7 +62,7 @@
List<DsmSpgSpqnmp> dsmSpgSpqnmpList = dsmSpgSpqnmpService.getList(paramSl);
data.forEach(dbExcel->{
-
+ dbExcel.setAvgValue(dbExcel.getAvgValue().replace("，",","));
if (StringUtil.isBlank(dbExcel.getRz())){
dbExcel.setRz("");
}
@@ -200,6 +201,7 @@
}
}
}catch (Exception e){
+ e.printStackTrace();
throw new RuntimeException("表格渗压数据个数超过当前水库断面测点个数");
}
--
Gitblit v1.9.3