Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -254,6 +254,7 @@ public class TaskListApi {
         JSONObject jsonObject = JSONObject.fromObject(str);
         String date = jsonObject.getString("date");
         String name = jsonObject.getString("name");
+
 //        JSONArray jsonCounty = jsonObject.getJSONArray("countyList");
         JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
 //        List<Map<String, Object>> countyList = (List<Map<String, Object>>) jsonCounty;

src/main/java/com/yxproject/start/mapper/GroupNoMapper.java

@@ -55,7 +55,7 @@ public interface GroupNoMapper {
             "where " +
 //            "county_dic.COUNTY_CODE is not null 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);
 
     /**

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -130,7 +130,6 @@ public class TaskListServiceImpl implements TaskListService {
         Map<String, Object> typeMap = new LinkedHashMap<>();
         //将查询出结果 按制证类型分成 Map
         for (Map o : maps) {
-            System.out.println(o.get("GROUP_NO")+"-----------");
             // 组合JSON
             if (typeMap != null && typeMap.containsKey(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 {
                         if (typemap.containsKey(i+"")){
                             List<Map<String, Object>> maplist = (List<Map<String, Object>>)typemap.get(i+"");
                             if (maplist.size()>=30){
-                                System.out.println("===========");
                                 i++;
                                 List<Map<String, Object>> maplist1 = new ArrayList<>();
                                 maplist1.add(o);
                                 typemap.put(i+"", maplist1);
                                 continue;
                             }else {
-                                System.out.println("------------");
                                 maplist.add(o);
                                 typemap.put(i+"", maplist);
                                 continue;
                             }
 
                         }else {
-                            System.out.println("+++++++++++");
                             List<Map<String, Object>> maplist = new ArrayList<>();
                             maplist.add(o);
                             typemap.put(i+"", maplist);
                             continue;
                         }
-
-//                mapList.get(i);
-
             }
             typeMap.put(type, typemap);
         }