Commit 045f29b9 authored by dahai's avatar dahai

push

parent 3a54189f
...@@ -211,14 +211,14 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -211,14 +211,14 @@ public class ReceiptServiceImpl implements ReceiptService {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type); List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String, Object> typemap = new LinkedHashMap<>(); Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String, Object> o : mapList) { for (Map<String, Object> o : mapList) {
if (typemap != null && typemap.containsKey(o.get("POLICE_CODE") + "")) { if (typemap != null && typemap.containsKey(o.get("COUNTYNAME") + "")) {
List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("POLICE_CODE") + ""); List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("COUNTYNAME") + "");
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("POLICE_CODE") + "", maplist_county); typemap.put(o.get("COUNTYNAME") + "", maplist_county);
} else { } else {
List<Map<String, Object>> maplist_county = new ArrayList<>(); List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("POLICE_CODE") + "", maplist_county); typemap.put(o.get("COUNTYNAME") + "", maplist_county);
} }
} }
typeMap.put(type, typemap); typeMap.put(type, typemap);
...@@ -265,7 +265,6 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -265,7 +265,6 @@ public class ReceiptServiceImpl implements ReceiptService {
countyMapGroup.put("groupNum", createGroupNo(c, nsList)); countyMapGroup.put("groupNum", createGroupNo(c, nsList));
} }
countyMapGroup.put("countyCode", countyCode); countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId);
countyMapGroup.put("policeList", countyMapList); countyMapGroup.put("policeList", countyMapList);
countyMapGroup.put("countyName", countyName); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount", validCount); countyMapGroup.put("countyValidCount", validCount);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment