|
@@ -24,7 +24,7 @@ case class CompanySummaryNg(s: SparkSession,
|
|
|
groupByInfo: GroupByInfoNg = null, //group的其它条件
|
|
|
where: String = "", //where条件,例如:deleted = 0
|
|
|
sortField: String = "ds"
|
|
|
- ) extends LoggingUtils {
|
|
|
+ ) extends LoggingUtils {
|
|
|
@(transient@getter) val spark: SparkSession = s
|
|
|
|
|
|
private val f_bytes: Array[Byte] = Bytes.toBytes("F")
|
|
@@ -333,7 +333,7 @@ object CompanySummaryNg {
|
|
|
, project = project
|
|
|
, tableName = tab
|
|
|
, companyIdField = "split(rowkey,'_')[0]"
|
|
|
- ,where = "instr(rowkey,'_') != 0 and deleted = 0"
|
|
|
+ , where = "instr(rowkey,'_') != 0 and deleted = 0"
|
|
|
)
|
|
|
}
|
|
|
|
|
@@ -346,11 +346,9 @@ object CompanySummaryNg {
|
|
|
|
|
|
def main(args: Array[String]): Unit = {
|
|
|
|
|
|
- val Array(tab) = args
|
|
|
-
|
|
|
println(
|
|
|
s"""
|
|
|
- |tab: $tab
|
|
|
+ |tab: ${args(0)}
|
|
|
|""".stripMargin)
|
|
|
|
|
|
val config = mutable.Map(
|
|
@@ -361,8 +359,11 @@ object CompanySummaryNg {
|
|
|
|
|
|
val spark = SparkUtils.InitEnv(getClass.getSimpleName, config)
|
|
|
|
|
|
-// run(spark, tab,"winhc_ng.tmp_xjk_summary")
|
|
|
-
|
|
|
+ if (args.length == 2 && !args(1).endsWith("}")) {
|
|
|
+ run(spark, args(0), args(1))
|
|
|
+ } else {
|
|
|
+ run(spark, args(0))
|
|
|
+ }
|
|
|
spark.stop()
|
|
|
}
|
|
|
}
|