From 43af0e398ff3cab37a75eff67a07f889a1da75a3 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 01 Mar 2024 11:32:31 +0800
Subject: [PATCH] 水库质量规则修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 b2533db..b0f1edf 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
@@ -50,7 +50,7 @@
String retStr = "-1";
switch (key) {
case "EQUAL": //等于
- retStr = " is null OR = '' ";
+ retStr = " is null";
break;
case "UNEQUAL": //不等于
retStr = " is not null ";
@@ -238,7 +238,7 @@
} else if (rc.getRelation().equals("OR")) {
relation = " OR ";
} else {
- relation = " WHERE ";
+ relation = " WHERE (";
}
sqlStr += relation + getPropSqlStr(rc.getBasic());
@@ -270,10 +270,15 @@
}
+ sqlStr += ")";
+
varStr = "concat(" + varStr +") AS val";
if (StringUtil.isNotBlank(rules.getIsGate())) {
- sqlStr += " and a.\"is_gate\" = " + rules.getIsGate();
+
+ String gateStr = rules.getIsGate().equals("1") ?"'有闸控制'":"'无闸控制'";
+
+ sqlStr += " and a.\"is_gate\" = " + gateStr;
}
// 拼接条件有问题，不操作
@@ -281,6 +286,7 @@
log.info("查询条件错误，请检查规则设置......：", sqlStr);
return R.fail(-1, sqlStr + "\\n 查询条件错误，请检查规则设置");
}
+
Integer ret = 0;
try {
@@ -292,7 +298,7 @@
log.info("执行完成......：");
}
- // 执行sql
+// 执行sql
return R.data(ret);
}
}
--
Gitblit v1.9.3