From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
index f7c03cd..ba6c4ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
@@ -97,9 +97,21 @@
if(extremumDO!=null&&extremumDO.getId()!=null){
return R.data(extremumService.updateById(extremumDO));
+ }else {
+
+ String type = extremumDO.getType();
+ String skId = extremumDO.getSkId();
+ ExtremumDO extremum = extremumService.getExtremum(type, skId);
+ if(extremum!=null){
+ extremumDO.setId(extremum.getId());
+ return R.data(extremumService.updateById(extremumDO));
+ }
+
+ return R.data(extremumService.saveOrUpdate(extremumDO));
}
- return R.data(extremumService.saveOrUpdate(extremumDO));
+
+
}
--
Gitblit v1.9.3