提交 9f586f7b authored 作者: inroi's avatar inroi

完成代码

上级 a262b9ea
...@@ -50,7 +50,7 @@ public class MallCommonSyncApi { ...@@ -50,7 +50,7 @@ public class MallCommonSyncApi {
List<Map<String, Object>> dataList = objectList.stream().map(m -> JsonUtil.toMap(JsonUtil.toString(m), String.class, Object.class)).collect(Collectors.toList()); List<Map<String, Object>> dataList = objectList.stream().map(m -> JsonUtil.toMap(JsonUtil.toString(m), String.class, Object.class)).collect(Collectors.toList());
this.databaseTableDataCreate(config.get("docType"), queueId, dataList); this.databaseTableDataCreate(config.get("docType"), queueId, dataList);
result.put("data", CommonApi.encapsulationData(config, dataList, fieldList)); result.put("data", dataList);
result.put("success", true); result.put("success", true);
} }
} else if (!MallConstants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.CODE_NAME))) && map.containsKey(Constants.ERROR_MESSAGE)) { } else if (!MallConstants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.CODE_NAME))) && map.containsKey(Constants.ERROR_MESSAGE)) {
......
...@@ -80,22 +80,31 @@ public class IMallSyncServiceImpl implements IMallSyncService { ...@@ -80,22 +80,31 @@ public class IMallSyncServiceImpl implements IMallSyncService {
Map<String,List<Object>> map2=new HashMap<>(); Map<String,List<Object>> map2=new HashMap<>();
for(Object list:objects){ for(Object list:objects){
Object bom_code = ((LinkedHashMap) list).get("BOM_CODE"); Object bom_code = ((LinkedHashMap) list).get("bom_code");
Object parent_code = ((LinkedHashMap) list).get("parent_code");
if(parent_code == null)
{
if(!map2.containsKey(bom_code)){ if(!map2.containsKey(bom_code)){
List<Object> item=new ArrayList<>(); List<Object> item=new ArrayList<>();
item.add(list);
map2.put((String)bom_code,item); map2.put((String)bom_code,item);
}else { }
List<Object> bomCodes = map2.get(bom_code); List<Object> bomCodes = map2.get(bom_code);
bomCodes.add(list); bomCodes.add(list);
}
else
{
if(!map2.containsKey(parent_code)){
List<Object> item=new ArrayList<>();
map2.put((String)parent_code,item);
}
List<Object> bomCodes = map2.get(parent_code);
bomCodes.add(list);
} }
} }
for(Map.Entry<String,List<Object>> maps:map2.entrySet()){ for(Map.Entry<String,List<Object>> maps:map2.entrySet()){
this.encapsulationRequest(config, queueId, id, maps.getValue()); this.encapsulationRequest(config, queueId, id, maps.getValue());
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论