uploaded ojdbc7.jar

src/main/java/com/dao/ShowChartsMapper.java

@@ -38,7 +38,7 @@ public interface ShowChartsMapper {
 
 
     //时间类型的X轴
-    @Select("select distinct to_char(${xAxisName},${timeType})time from TEST_BI_DATA ORDER by to_char(${xAxisName},${timeType}) ASC")
+    @Select("select distinct to_char(${xAxisName},${timeType})time from ${tableName} ORDER by to_char(${xAxisName},${timeType}) ASC")
     List<String> getTimeDate(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("timeType") String timeType);
 
     //半年

src/main/java/com/server/ShowIndividualService.java

@@ -38,7 +38,6 @@ public class ShowIndividualService {
         //取表名
         int id = individualConfigInfo.getId();
         String tableName = chartsConfigMapper.getTableName(id);
-//        String tableName = "bench_flowchart".toUpperCase();
         if (tableName == null || "".equals(tableName)){
             return new RepEntity(RepCode.nullTableName);
         }
@@ -149,8 +148,8 @@ public class ShowIndividualService {
         String st1 = "[";
         String st2 = "]";
         String strA = str.replace(st1, "");
-        String StrB = strA.replace(st2, "");
-        System.out.println("str:"+ StrB);
-        return StrB;
+        String strB = strA.replace(st2, "");
+        System.out.println("str:"+ strB);
+        return strB;
     }
 }

src/main/java/com/server/ShowLineService.java

@@ -87,6 +87,7 @@ public class ShowLineService {
             return new RepEntity(RepCode.Null);
         }
 
+        //筛选
             List<Screen> screens = lineConfigInfo.getFilters();
             String screen = "";
             if ("".equals(screens) || screens == null){

src/main/java/com/server/ShowPopulationService.java

@@ -60,11 +60,14 @@ public class ShowPopulationService {
             List<Screen> screens = populationInfo.getFilters();
             String screen = "";
             String screenStr = "";
-            if ("".equals(screens) || screens == null){
+            if ("".equals(screens) || screens == null || screens.size() == 0){
                 screen = "";
+                screenStr = "";
             }else {
                 screen = screenUtil.screensUtil(screens);
-                screenStr = screen.replace("and", "where");
+//                screenStr = screen.replace("and", "where");
+                StringBuilder sb = new StringBuilder(screen);
+                screenStr = String.valueOf(sb .replace(1, 5, "where "));
             }
 
         //无分组
@@ -140,8 +143,8 @@ public class ShowPopulationService {
         String st1 = "[";
         String st2 = "]";
         String strA = str.replace(st1, "");
-        String StrB = strA.replace(st2, "");
-        System.out.println("str:"+ StrB);
-        return StrB;
+        String strB = strA.replace(st2, "");
+        System.out.println("str:"+ strB);
+        return strB;
     }
 }

src/main/java/com/util/ScreenUtil.java

@@ -25,7 +25,7 @@ public class ScreenUtil {
             String symbol = screen.getSymbol();
             String value = screen.getValue();
 
-            if (columnType != "time"){
+            if (columnType != "time" && !("time".equals(columnType))){
                 String symbVal = getSymbAndVal(symbol, value);
                 ret = ret + " and " + columnName + " " + symbVal;
                 System.out.println("ret:" + ret);
@@ -38,16 +38,16 @@ public class ScreenUtil {
         return ret;
     }
     public String getSymbAndVal(String symbol, String value){
-        String values = "'" + value;
+        String values = "" + value;
         String tar = "";
         if ("contain".equals(symbol)){
-            tar = "like %" + values + "%'";
+            tar = "like '%" + values + "%'";
         }else if("notContain".equals(symbol)){
-            tar = "not like %" + values + "%'";
+            tar = "not like '%" + values + "%'";
         }else if("startsWith".equals(symbol)){
-            tar = "like " + values + "%'";
+            tar = "like '" + values + "%'";
         }else if("endsWith".equals(symbol)){
-            tar = "like %" + values +"'";
+            tar = "like '%" + values +"'";
         }else if("null".equals(symbol)){
             tar = "is null";
         }else if ("notNull".equals(symbol)){
@@ -63,14 +63,21 @@ public class ScreenUtil {
     }
 
     private String getTimeSymbAndVal(String symbol, String value){
-        String values = "'" + value;
+        String values = "" + value;
         String tar = "";
         if("null".equals(symbol)){
             tar = "is null";
         }else if ("notNull".equals(symbol)){
             tar = "is not null";
-        }else {
-            tar = symbol + " " + values + "'";
+        }else if ("between".equals(symbol)){
+            tar = "";
+            String[] str = value.split(",");
+            String str1 = str[0];
+            String str2 = str[1];
+            tar = "between str1";
+        }
+        else {
+            tar = symbol + " '" + values + "'";
         }
         return tar;
     }