|
@@ -99,8 +99,13 @@ object CompanyDynamic {
|
|
|
val biz_date = r.getAs[String]("biz_date")
|
|
|
val fields = r.getAs[String]("fields")
|
|
|
val cname = r.getAs[String]("cname")
|
|
|
- val result = handle.handle(rowkey, biz_date, cid, if (fields == null) null else fields.split(","), old_data, new_data)
|
|
|
- result.map(res => Row(cid, if (cname == null) null else cname, res._1, res._2, res._3, res._4, res._5, res._6, res._7, res._8, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
|
|
|
+ val result = handle.handle(rowkey, biz_date, cid, if (fields == null) null else fields.split(","), old_data, new_data, cname)
|
|
|
+ if(result == null){
|
|
|
+ null
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ result.map(res => Row(cid, if (cname == null) null else cname, res._1, res._2, res._3, res._4, res._5, res._6, res._7, res._8, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
val schema = getSchema(ListMap(
|