From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java         |   32 ++++++++++++++++----------------
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml |    6 ++----
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
index e08c100..969a40d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
@@ -61,40 +61,40 @@
 		String retStr = "-1";
 		switch (key) {
 			case "GREATER": //大于
-				retStr = " &gt; " + target;
+				retStr = " > " + target;
 				break;
 			case "GREATER_EQUAL": //大于等于
-				retStr = " &gt;= " + target;
+				retStr = " >= " + target;
 				break;
 			case "EQUAL": //等于
 				retStr = " = " + target;
 				break;
 			case "LESS_EQUAL": //小于等于
-				retStr = " &lt;= " + target;
+				retStr = " <= " + target;
 				break;
 			case "LESS":  //小于
-				retStr = " &lt; " + target;
+				retStr = " < " + target;
 				break;
 			case "UNEQUAL": //不等于
-				retStr = " &lt;&gt; " + target;
+				retStr = " <> " + target;
 				break;
 			case "DIFFER_GRATER": //差值大于
-				retStr = " - " + target + " &gt; " + val;
+				retStr = " - " + target + " > " + val;
 				break;
 			case "DIFFER_GRATER_EQUAL": //差值大于等于
-				retStr = " - " + target + " &gt;= " + val;
+				retStr = " - " + target + " >= " + val;
 				break;
 			case "DIFFER_EQUAL": //差值等于
 				retStr = " - " + target + " = " + val;
 				break;
 			case "DIFFER_LESS_EQUAL": //差值小于等于
-				retStr = " - " + target + " &lt; " + val;
+				retStr = " - " + target + " < " + val;
 				break;
 			case "DIFFER_LESS": //差值小于
-				retStr = " - " + target + " &lt;= " + val;
+				retStr = " - " + target + " <= " + val;
 				break;
 			case "DIFFER_UNEQUAL": //差值不等于
-				retStr = " - " + target + " &lt;&gt; " + val;
+				retStr = " - " + target + " <> " + val;
 				break;
 		}
 		return retStr;
@@ -110,22 +110,22 @@
 		String retStr = "-1";
 		switch (key) {
 			case "GREATER": //大于
-				retStr = " &gt; " + val;
+				retStr = " > " + val;
 				break;
 			case "GREATER_EQUAL": //大于等于
-				retStr = " &gt;= " + val;
+				retStr = " >= " + val;
 				break;
 			case "EQUAL": //等于
 				retStr = " = " + val;
 				break;
 			case "LESS_EQUAL": //小于等于
-				retStr = " &lt;= " + val;
+				retStr = " <= " + val;
 				break;
 			case "LESS":  //小于
-				retStr = " &lt; " + val;
+				retStr = " < " + val;
 				break;
 			case "UNEQUAL": //不等于
-				retStr = " &lt;&gt; " + val;
+				retStr = " <> " + val;
 				break;
 		}
 		return retStr;
@@ -221,7 +221,7 @@
 			} else if (rc.getRelation().equals("OR")) {
 				relation = " OR ";
 			} else {
-				relation = "";
+				relation = " WHERE ";
 			}
 
 			sqlStr += relation + getPropSqlStr(rc.getBasic());
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
index fc00e5c..4e29858 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
@@ -48,7 +48,7 @@
 
     <insert id="addQualityManage">
         insert into SM_RES_DATA_QUALITY_MANAGE (res_id,rule_id,create_time,update_time)
-        select a."guid" as res_id,#{ruleId},NOW(),NOW()
+        select a."guid" as res_id,${ruleId} AS rule_id,NOW() AS create_time,NOW() AS update_time
         from SJZT_MD."att_res_base" a
                  left join SJZT_MD."att_res_danger_manage_special" b on (a."guid" = b."res_guid")
                  left join SJZT_MD."att_res_stag_char" c on (a."guid" = c."res_guid")
@@ -59,9 +59,7 @@
                  left join SJZT_MD."st_rsvr_r_last" f on (e."code" = f."stcd")
                  left join (select tmp."res_guid",max(tmp."tb_weir_top_elevation") "tb_weir_top_elevation" from SJZT_MD."att_res_rsb_norspi" tmp group by tmp."res_guid") g on (a."guid" = g."res_guid")
                  left join (select tmp2."res_guid",max(tmp2."tb_dam_top_elevation") "tb_dam_top_elevation" from SJZT_MD."att_res_water_block" tmp2 group by tmp2."res_guid") h on (a."guid" = h."res_guid")
-        <where>
-            #{whereStr}
-        </where>
+            ${whereStr}
     </insert>
 
 </mapper>

--
Gitblit v1.9.3