guoshilong
2024-01-25 91fff6d21fcec11fca3097cd7641d9ea9ebfda8d
若有固定值,则指标条件加上固定值
1 files modified
5 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java 5 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
@@ -12,6 +12,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -246,7 +247,9 @@
            if (rc.getProp().equals("NULLVAL")) { // 空值
                sqlStr += getConditionSqlStrByNullVal(rc.getCondition());
            } else if (rc.getProp().equals("TARGET")) { // 指标
                sqlStr += getConditionSqlStrByTarget(rc.getCondition(), getPropSqlStr(rc.getTarget()), rc.getValue());
                sqlStr += ObjectUtil.isNotEmpty(rc.getFixValue())?
                    getConditionSqlStrByTarget(rc.getCondition(), getPropSqlStr(rc.getTarget()), rc.getValue())+"-"+rc.getFixValue() :
                    getConditionSqlStrByTarget(rc.getCondition(), getPropSqlStr(rc.getTarget()), rc.getValue());
            } else {
                sqlStr += getConditionSqlStrByVal(rc.getCondition(), rc.getValue());
            }