Merge branch 'developer' into 'master'

取数平台调整

See merge request !38

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

@@ -133,7 +133,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 						//curFilterText = "\"" + queryCondition.getFieldName() + "\" in (";
 						curFilterText = " " + queryCondition.getFieldName() + " in (";
 						for (int i = 0; i < equalValues.length; i++) {
-							curFilterText += i == 0 ? "'" + equalValues[i] + "'" : ",'" + equalValues[i] + "'";
+							String symbol = getSymbol(equalValues[i]);
+							curFilterText += i == 0 ? symbol + equalValues[i] + symbol : "," + symbol + equalValues[i] + symbol;
 						}
 						curFilterText += ") ";
 					} // IF OVER
@@ -192,6 +193,16 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		return queryFull;
 	}
 
+	private String getSymbol(String value){
+		if(value.contains("'")){
+			return "\"";
+		}
+		if(value.contains("\"")){
+			return "'";
+		}
+		return "'";
+	}
+
 	@Override
 	public FlatQueryResult getFlatQueryResult(String tableId, List<String> enterpriseIds, List<FlatQueryCondition> queryConditions, String orderField, String orderDir,
 	                                          Boolean execDistinct, Integer queryDataType, Integer limitRange, int dataPermission, List<String> authStoreIdList) {
@@ -521,10 +532,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 
 
 	public static void main(String[] args) throws ParseException {
-		String date = "2021-09-01";
-		Date parse = dateFormatter.parse(date);
-		String format = datetimeFormatter.format(parse);
-		System.out.println("date = " + format);
+		String s = new FlatQueryResultServiceImpl().parseValue("瞎搞门店'名称");
+		System.out.println("s = " + s);
 	}
 
 	/** 下载任务执行计时器 */