|
|
@@ -272,13 +272,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
if (!StringUtils.isEquals("[]", fdb.getVal())) {
|
|
|
List<ElementBlock> elementBlockList = JSON.parseArray(fdb.getVal(), ElementBlock.class);
|
|
|
Map<String,Map<String,Set<Long>>> traceMap= new HashMap<>();
|
|
|
- Map<String,List<ElementBlock>> tableElmentMap= new HashMap<>();
|
|
|
+ Map<String,List<ElementBlock>> tableElementMap= new HashMap<>();
|
|
|
elementBlockList.forEach(e->{
|
|
|
if(e.getList().stream().flatMap(it->it.getData().stream().flatMap(Collection::stream)).anyMatch(Objects::isNull)){
|
|
|
String[] codeArr= e.getCode().split(":");
|
|
|
Map<String,Set<Long>> tmp = traceMap.computeIfAbsent(codeArr[0],k->new HashMap<>());
|
|
|
tmp.put(codeArr[1],e.getList().stream().map(ItemBlock::getPkeyId).collect(Collectors.toSet()));
|
|
|
- List<ElementBlock> teList = tableElmentMap.computeIfAbsent(codeArr[0],k->new ArrayList<>());
|
|
|
+ List<ElementBlock> teList = tableElementMap.computeIfAbsent(codeArr[0],k->new ArrayList<>());
|
|
|
teList.add(e);
|
|
|
}
|
|
|
});
|
|
|
@@ -293,7 +293,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
List<Map<String,Object>> dataList =this.jdbcTemplate.queryForList(sql);
|
|
|
if(dataList.size()>0){
|
|
|
Map<Long,Map<String,Object>> group =dataList.stream().collect(Collectors.toMap(m->Long.parseLong(m.get("p_key_id").toString()),m->m,(v1,v2)->v1));
|
|
|
- List<ElementBlock> teList = tableElmentMap.get(initTableName);
|
|
|
+ List<ElementBlock> teList = tableElementMap.get(initTableName);
|
|
|
teList.forEach(it->{
|
|
|
List<ItemBlock> itemBlockList= it.getList();
|
|
|
String ekey=it.getCode().split(":")[1];
|
yangyj