按组号从制证库中查询未保存的任务单

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

@@ -155,6 +155,17 @@ public class TaskListApi {
         return objects;
     }
 
+    /**
+     * 查询缺保存的任务单详情
+     * (受理库)
+     * （创建）
+     * @return
+     */
+    @RequestMapping("queryByCounty")
+    public List<Object> queryByCounty(@RequestParam("groupNo1") String groupNo1,@RequestParam("groupNo2") String groupNo2) {
+        return taskListService.selectByCounty(groupNo1,groupNo2);
+    }
+
     /**
      * 查询组号列表详情
      * 受理库

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

@@ -31,6 +31,16 @@ public interface TaskListMapper {
             "order by ACC_GROUP_T.group_no")
     public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
 
+    @Select("select DISTINCT CARD_TYPE_DIC.*, PROD_GROUP_T.* ,'000000' COUNTY_CODE,'0000' COUNTYNAME,'3' DEAL_FLAG, '00000000' USER_CODE from PROD_CARD_T@PRODYD_LINK \n" +
+            "left join PROD_GROUP_T@PRODYD_LINK on substr(prod_card_t.accept_no,0,8) = prod_GROUP_T.group_no\n" +
+            "left join PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.group_no =PROD_GROUP_T.group_no\n" +
+            "left join CARD_TYPE_DIC on decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "where \n" +
+            "PROD_GROUP_T.group_no not in (select group_no from group_no)\n" +
+            "and PROD_GROUP_T.GROUP_NO BETWEEN #{groupNo1} AND #{groupNo2}\n"+
+            "order by PROD_GROUP_T.group_no")
+    public List<Map<String,Object>> selectByCounty(@Param("groupNo1") String groupNo1,@Param("groupNo2") String groupNo2);
+
     /**
      * 组号列表查询
      * 受理库

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -23,6 +23,8 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtACCU(String date);
 
+    public List<Object> selectByCounty(String groupNo1,String groupNo2);
+
     public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode,long currPage, long pageSize);
 
     public List<Object> selectByCountyAtAuxiliary(long process);

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

@@ -246,6 +246,129 @@ public class TaskListServiceImpl implements TaskListService {
         return typeList;
     }
 
+    /**
+     * 查询缺保存的任务单详情
+     * 制证库
+     * @return
+     */
+    @Override
+    public List selectByCounty(String groupNo1,String groupNo2){
+        List<Map<String, Object>> maps = taskListMapper.selectByCounty(groupNo1,groupNo2);
+        Map<String, Object> typeMap = new LinkedHashMap<>();
+        //将查询出结果 按制证类型分成 Map
+        for (Map o : maps) {
+            // 组合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") + "");
+                mapList.add(o);
+                typeMap.put(o.get("CARD_TYPE") + "", mapList);
+            } else {
+                List<Map<String, Object>> mapList = new ArrayList<>();
+                mapList.add(o);
+                typeMap.put(o.get("CARD_TYPE") + "", mapList);
+            }
+        }
+        //将已按制证分好的Map 再次细化分为区县Map
+        for (String type : typeMap.keySet()) {
+            List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
+            Map<String, Object> typemap = new LinkedHashMap<>();
+            int i = 0;
+            for (Map<String, Object> o : mapList) {
+                if (typemap.containsKey(i + "")) {
+                    List<Map<String, Object>> maplist = (List<Map<String, Object>>) typemap.get(i + "");
+                    if (maplist.size() >= 30) {
+                        i++;
+                        List<Map<String, Object>> maplist1 = new ArrayList<>();
+                        maplist1.add(o);
+                        typemap.put(i + "", maplist1);
+                        continue;
+                    } else {
+                        maplist.add(o);
+                        typemap.put(i + "", maplist);
+                        continue;
+                    }
+
+                } else {
+                    List<Map<String, Object>> maplist = new ArrayList<>();
+                    maplist.add(o);
+                    typemap.put(i + "", maplist);
+                    continue;
+                }
+            }
+            typeMap.put(type, typemap);
+        }
+        List<Map<String, Object>> typeList = new ArrayList<>();
+        for (String type : typeMap.keySet()) {
+            Map<String, Object> mapType = new LinkedHashMap<>();
+            int typeSum = 0;
+            String typeName = null;
+            List<Map<String, Object>> countyList = new ArrayList<>();
+            Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
+            int num = 0;
+            for (String county : mapList.keySet()) {
+                Map<String, Object> countyMapGroup = new LinkedHashMap<>();
+                int validCount = 0;
+                int invalidCount = 0;
+                String countyName = null;
+                Object submitDate = null;
+                long dealFlag = 3;
+                List<Map<String, Object>> countyMapList = mapList.get(county);
+                for (Map<String, Object> countyMap : countyMapList) {
+                    submitDate = countyMap.get("SUBMIT_DATE");
+                    countyName = countyMap.get("COUNTYNAME") + "";
+                    typeName = countyMap.get("CARD_TYPE_ID") + "";
+                    if (Long.valueOf(countyMap.get("DEAL_FLAG") + "") < dealFlag) {
+                        dealFlag = Long.valueOf(countyMap.get("DEAL_FLAG") + "");
+                    } else {
+
+                    }
+                    typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
+                    validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
+                    invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
+                }
+                if (countyMapList.size() == 1) {
+                    countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
+                } else {
+                    List<String> c = new ArrayList<>();
+                    List<String> nsList = new ArrayList<>();
+                    for (int i = 0; i < countyMapList.size(); i++) {
+                        /**
+                         * 判断组号中时候含有历史回迁组
+                         */
+                        if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
+                            if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
+                                nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
+                            }
+
+                        } else {
+                            if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
+                                nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + ""));
+                            }
+                        }
+                    }
+                    countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
+                }
+                countyMapGroup.put("countyCode", county);
+                countyMapGroup.put("dealFlag", dealFlag);
+                countyMapGroup.put("groupList", countyMapList);
+                countyMapGroup.put("saveDate", submitDate);
+                num++;
+                countyMapGroup.put("id", num);
+                countyMapGroup.put("countyName", countyName);
+                countyMapGroup.put("countyValidCount", validCount);
+                countyMapGroup.put("countyInvalidCount", invalidCount);
+                countyList.add(countyMapGroup);
+            }
+            mapType.put("typeCode", typeName);
+            mapType.put("typeSum", typeSum);
+            mapType.put("typeName", type);
+            mapType.put("countyList", countyList);
+
+            typeList.add(mapType);
+        }
+        return typeList;
+    }
+
     /**
      * 查询组号列表详情
      * 受理库
@@ -1201,6 +1324,42 @@ public class TaskListServiceImpl implements TaskListService {
         return "";
     }
 
+    private String createGroupNoMiss(List<String> c, List<String> nsList) {
+        try {
+            String groupNo = "";
+            c.add(nsList.get(0));
+            for (int i = 0; i < nsList.size() - 1; ++i) {
+                String t = nsList.get(i);
+                String n = nsList.get(i + 1);
+                String l = String.valueOf(Integer.parseInt(t.substring(1,8))+1);
+                String m = n.substring(1,8);
+                if (l.equals(m)) {
+                    c.add(nsList.get(i + 1));
+                } else {
+                    if (c.size() >= 1) {
+                        if (c.size() == 1) {
+                            groupNo += c.get(0) + ",";
+                        } else {
+                            groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
+                        }
+                    }
+                    c.clear();
+                    c.add(nsList.get(i + 1));
+                }
+            }
+            if (c.size() >= 1) {
+                if (c.size() == 1) {
+                    groupNo += c.get(0) + ",";
+                } else {
+                    groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
+                }
+            }
+            return groupNo;
+        } catch (Exception e) {
+        }
+        return "";
+    }
+
 
     private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
         Map<String, Object> typeMap = new LinkedHashMap<>();