Browse Source

fix: 动态 工商动态不折叠

许家凯 3 years ago
parent
commit
50b9f5b120

+ 7 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/CompanyDynamicRecord.scala

@@ -122,7 +122,13 @@ case class CompanyDynamicRecord(id: String,
     val risk_level_str = association_entity_info.map(_.risk_level).distinct.mkString(",")
     val risk_level_detail = association_entity_info.filter(r => StringUtils.isNotBlank(r.keyno)).map(r => s"${r.keyno}@@${r.risk_level}").distinct.mkStringOrNull(",")
     val agg_detail_rowkey_str: String = if (agg_detail_rowkey == null || agg_detail_rowkey.isEmpty) null else agg_detail_rowkey.map(_.toStr).mkString(",")
-    val collapse_key = if (bus_tn.contains(tn)) s"${dynamic_code}_${dynamic_time}" else s"${CollapseKeyArgs.transform(tn)}_${dynamic_time}"
+    val collapse_key = if (bus_tn.contains(tn)) {
+      if (dynamic_code.equals("110101"))//存量法人变化转化为增量的code
+        s"101003_${dynamic_time}"
+      else
+        s"${dynamic_code}_${dynamic_time}"
+    } else
+      s"${CollapseKeyArgs.transform(tn)}_${dynamic_time}"
     Row(SecureUtil.md5(id)
       , association_entity_info.toJson()
       , rowkey