From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java | 1 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml | 11 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java | 9 ++++++++-
3 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java
index b0342cd..15f7a95 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java
@@ -16,5 +16,6 @@
public interface AttResRsbNorspiMapper extends BaseMapper<AttResRsbNorspi> {
Integer updateAttResRsbNorspiByResId(@Param("attResRsbNorspi")AttResRsbNorspi attResRsbNorspi);
+ Integer addAttResRsbNorspi(@Param("attResRsbNorspi")AttResRsbNorspi attResRsbNorspi);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml
index 37af313..e7e2ff1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml
@@ -11,4 +11,15 @@
"update_time" = #{attResRsbNorspi.updateTime}
WHERE "res_guid" = #{attResRsbNorspi.resGuid}
</update>
+
+ <insert id="addAttResRsbNorspi">
+ insert into "att_res_rsb_norspi"("guid", "tb_weir_top_elevation", "res_guid", "create_time", "update_time",
+ "update_by")
+ VALUES (rawtohex(sys_guid()),
+ #{attResRsbNorspi.tbWeirTopElevation},
+ #{attResRsbNorspi.resGuid},
+ #{attResRsbNorspi.updateTime},
+ #{attResRsbNorspi.updateTime},
+ #{attResRsbNorspi.updateBy})
+ </insert>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
index 8066957..a13b0fb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
@@ -44,7 +44,14 @@
paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
attResRsbNorspi.setUpdateBy(paramJson.toJSONString());
- return SqlHelper.retBool(baseMapper.updateAttResRsbNorspiByResId(attResRsbNorspi));
+ Integer ret = baseMapper.updateAttResRsbNorspiByResId(attResRsbNorspi);
+
+ //如果修改影响行数为0 需要添加数据
+ if (ret == 0) {
+ baseMapper.addAttResRsbNorspi(attResRsbNorspi);
+ }
+
+ return SqlHelper.retBool(ret);
}
--
Gitblit v1.9.3