From 647add01535449d506479fe68f7238f672d9887c Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 7 Feb 2025 14:26:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/engine/utils/Utils.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index f3025a9451..59c9452a61 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -498,10 +498,10 @@ public class Utils { public static String transGroupFieldToSql(DatasetTableFieldDTO dto, List fields) { // get origin field - String originField = null; + DatasetTableFieldDTO originField = null; for (DatasetTableFieldDTO ele : fields) { if (Objects.equals(ele.getId(), Long.valueOf(dto.getOriginName()))) { - originField = ele.getDataeaseName(); + originField = ele; break; } } @@ -511,29 +511,29 @@ public class Utils { StringBuilder exp = new StringBuilder(); exp.append(" (CASE WHEN "); - if (dto.getDeType() == 0) { + if (originField.getDeType() == 0) { for (FieldGroupDTO fieldGroupDTO : dto.getGroupList()) { for (int i = 0; i < fieldGroupDTO.getText().size(); i++) { String value = fieldGroupDTO.getText().get(i); - exp.append(originField).append(" = ").append("'").append(value).append("'"); + exp.append(originField.getDataeaseName()).append(" = ").append("'").append(value).append("'"); if (i < fieldGroupDTO.getText().size() - 1) { exp.append(" OR "); } } exp.append(" THEN '").append(fieldGroupDTO.getName()).append("'"); } - } else if (dto.getDeType() == 1) { + } else if (originField.getDeType() == 1) { for (FieldGroupDTO fieldGroupDTO : dto.getGroupList()) { - exp.append(originField).append(" >= ").append("'").append(fieldGroupDTO.getStartTime()).append("'"); + exp.append(originField.getDataeaseName()).append(" >= ").append("'").append(fieldGroupDTO.getStartTime()).append("'"); exp.append(" AND "); - exp.append(originField).append(" <= ").append("'").append(fieldGroupDTO.getEndTime()).append("'"); + exp.append(originField.getDataeaseName()).append(" <= ").append("'").append(fieldGroupDTO.getEndTime()).append("'"); exp.append(" THEN '").append(fieldGroupDTO.getName()).append("'"); } - } else if (dto.getDeType() == 2 || dto.getDeType() == 3 || dto.getDeType() == 4) { + } else if (originField.getDeType() == 2 || originField.getDeType() == 3 || originField.getDeType() == 4) { for (FieldGroupDTO fieldGroupDTO : dto.getGroupList()) { - exp.append(originField).append(StringUtils.equalsIgnoreCase(fieldGroupDTO.getMinTerm(), "le") ? " >= " : " > ").append(fieldGroupDTO.getMin()); + exp.append(originField.getDataeaseName()).append(StringUtils.equalsIgnoreCase(fieldGroupDTO.getMinTerm(), "le") ? " >= " : " > ").append(fieldGroupDTO.getMin()); exp.append(" AND "); - exp.append(originField).append(StringUtils.equalsIgnoreCase(fieldGroupDTO.getMaxTerm(), "le") ? " <= " : " < ").append(fieldGroupDTO.getMax()); + exp.append(originField.getDataeaseName()).append(StringUtils.equalsIgnoreCase(fieldGroupDTO.getMaxTerm(), "le") ? " <= " : " < ").append(fieldGroupDTO.getMax()); exp.append(" THEN '").append(fieldGroupDTO.getName()).append("'"); } }