|
@@ -93,7 +93,7 @@ case class NgCompanyDynamic(s: SparkSession,
|
|
|
val filter = args_map(r.tn).filter
|
|
|
if (filter == null) {
|
|
|
true
|
|
|
-// CompanyDynamicUtils.default_filter(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
|
|
|
+ // CompanyDynamicUtils.default_filter(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
|
|
|
} else {
|
|
|
filter.apply(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
|
|
|
}
|
|
@@ -184,7 +184,17 @@ object NgCompanyDynamic {
|
|
|
)
|
|
|
val spark = SparkUtils.InitEnv(this.getClass.getSimpleName, config)
|
|
|
val inc = false
|
|
|
- NgCompanyDynamic(spark, NgCompanyDynamicArgs.getStartArgs(inc), NgCompanyDynamicArgs.getAggArgs, inc = inc).calc()
|
|
|
+ val tn = "all"
|
|
|
+ var dynamicArgs = NgCompanyDynamicArgs.getStartArgs(inc)
|
|
|
+ var aggArgs = NgCompanyDynamicArgs.getAggArgs
|
|
|
+ if (!"all".equals(tn)) {
|
|
|
+ val set = tn.split(",").toSet
|
|
|
+ dynamicArgs = dynamicArgs.filter(r => set.contains(r.tn))
|
|
|
+ aggArgs = aggArgs.filter(r=>{
|
|
|
+ r.tabs.forall(s => set.contains(s))
|
|
|
+ })
|
|
|
+ }
|
|
|
+ NgCompanyDynamic(spark, dynamicArgs, aggArgs, inc = inc).calc()
|
|
|
spark.stop()
|
|
|
}
|
|
|
}
|