dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4576 from dataease/pr@dev@pages

Browse Source 
fix: 抽取 oralce date类型数据格式化
This commit is contained in:
taojinlong 2023-02-20 15:34:31 +08:00 committed by GitHub
commit fa8e22aa8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -880,6 +880,7 @@ public class OracleQueryProvider extends QueryProvider {
ChartViewFieldDTO f = new ChartViewFieldDTO(); ChartViewFieldDTO f = new ChartViewFieldDTO();
f.setOriginName(datasetTableField.getOriginName()); f.setOriginName(datasetTableField.getOriginName());
f.setDeType(0); f.setDeType(0);
f.setType(datasetTableField.getType());
xAxis.add(f); xAxis.add(f);
}); });
@ -916,7 +917,7 @@ public class OracleQueryProvider extends QueryProvider {
continue; continue;
} }
String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
if(datasetTableField.getType().equals("DATE")){ if(xAxis.get(i).getType().equals("DATE")){
originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT); originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT);
} }
String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName()); String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName());