Commit b4009e41 authored by dahai's avatar dahai

push

parent 0c4daab6
...@@ -254,6 +254,7 @@ public class TaskListApi { ...@@ -254,6 +254,7 @@ public class TaskListApi {
JSONObject jsonObject = JSONObject.fromObject(str); JSONObject jsonObject = JSONObject.fromObject(str);
String date = jsonObject.getString("date"); String date = jsonObject.getString("date");
String name = jsonObject.getString("name"); String name = jsonObject.getString("name");
// JSONArray jsonCounty = jsonObject.getJSONArray("countyList"); // JSONArray jsonCounty = jsonObject.getJSONArray("countyList");
JSONArray jsonGroup = jsonObject.getJSONArray("groupList"); JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
// List<Map<String, Object>> countyList = (List<Map<String, Object>>) jsonCounty; // List<Map<String, Object>> countyList = (List<Map<String, Object>>) jsonCounty;
......
...@@ -55,7 +55,7 @@ public interface GroupNoMapper { ...@@ -55,7 +55,7 @@ public interface GroupNoMapper {
"where " + "where " +
// "county_dic.COUNTY_CODE is not null and " + // "county_dic.COUNTY_CODE is not null and " +
"ACC_GROUP_T.deal_flag =3 and" + "ACC_GROUP_T.deal_flag =3 and" +
" ACC_GROUP_T.group_no in (#{groupNo} ) ") " ACC_GROUP_T.group_no in (${groupNo} ) ")
public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo); public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo);
/** /**
......
...@@ -130,7 +130,6 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -130,7 +130,6 @@ public class TaskListServiceImpl implements TaskListService {
Map<String, Object> typeMap = new LinkedHashMap<>(); Map<String, Object> typeMap = new LinkedHashMap<>();
//将查询出结果 按制证类型分成 Map //将查询出结果 按制证类型分成 Map
for (Map o : maps) { for (Map o : maps) {
System.out.println(o.get("GROUP_NO")+"-----------");
// 组合JSON // 组合JSON
if (typeMap != null && typeMap.containsKey(o.get("CARD_TYPE") + "")) { if (typeMap != null && typeMap.containsKey(o.get("CARD_TYPE") + "")) {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE")+""); List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE")+"");
...@@ -151,29 +150,23 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -151,29 +150,23 @@ public class TaskListServiceImpl implements TaskListService {
if (typemap.containsKey(i+"")){ if (typemap.containsKey(i+"")){
List<Map<String, Object>> maplist = (List<Map<String, Object>>)typemap.get(i+""); List<Map<String, Object>> maplist = (List<Map<String, Object>>)typemap.get(i+"");
if (maplist.size()>=30){ if (maplist.size()>=30){
System.out.println("===========");
i++; i++;
List<Map<String, Object>> maplist1 = new ArrayList<>(); List<Map<String, Object>> maplist1 = new ArrayList<>();
maplist1.add(o); maplist1.add(o);
typemap.put(i+"", maplist1); typemap.put(i+"", maplist1);
continue; continue;
}else { }else {
System.out.println("------------");
maplist.add(o); maplist.add(o);
typemap.put(i+"", maplist); typemap.put(i+"", maplist);
continue; continue;
} }
}else { }else {
System.out.println("+++++++++++");
List<Map<String, Object>> maplist = new ArrayList<>(); List<Map<String, Object>> maplist = new ArrayList<>();
maplist.add(o); maplist.add(o);
typemap.put(i+"", maplist); typemap.put(i+"", maplist);
continue; continue;
} }
// mapList.get(i);
} }
typeMap.put(type, typemap); typeMap.put(type, typemap);
} }
......
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