Merge branch 'developer' into 'master'

取数平台调整

See merge request !41

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

@@ -163,6 +163,17 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 					String overDate = queryCondition.getExtendFilter() + "";
 					//curFilterText = "\"" + queryCondition.getFieldName() + "\" >= '" + startDate + "' AND \"" + queryCondition.getFieldName() + "\" <= '" + overDate + "'";
 					curFilterText = " " + queryCondition.getFieldName() + " >= '" + startDate + "' AND " + queryCondition.getFieldName() + " <= '" + overDate + "'";
+					if("extract_order_information".equals(tableId) && "receipts_date".equals(queryCondition.getFieldName())){
+						//订单表如果使用了单据时间，增加分区字段
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+						try {
+							String startMonth = sdf.format(sdf.parse(startDate));
+							String endMonth = sdf.format(sdf.parse(overDate));
+							curFilterText += " AND ds >='" + startMonth + "' AND ds<='" + endMonth +"' ";
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
 				}
 
 				// 合并到主查询过滤中