Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-03-04 8ea0f39d1c072e1f3ab9970be110bca212773848

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java

@@ -238,7 +238,7 @@
            } else if (rc.getRelation().equals("OR")) {
                relation = " OR ";
            } else {
                relation = " WHERE ";
                relation = " WHERE (";
            }

            sqlStr += relation + getPropSqlStr(rc.getBasic());
@@ -270,11 +270,13 @@

        }

        sqlStr += ")";

        varStr = "concat(" + varStr +") AS val";

        if (StringUtil.isNotBlank(rules.getIsGate())) {

            String gateStr = rules.getIsGate().equals("1") ?"'有闸水库'":"'无闸水库'";
            String gateStr = rules.getIsGate().equals("1") ?"'有闸控制'":"'无闸控制'";

            sqlStr += " and a.\"is_gate\" = " + gateStr;
        }
@@ -285,6 +287,7 @@
            return R.fail(-1, sqlStr + "\\n 查询条件错误，请检查规则设置");
        }


        Integer ret = 0;
        try {
            ret = qualityManageService.addQualityManage(id, varStr, sqlStr);