修改组号的压缩方法

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

@@ -420,23 +420,23 @@ public class ReceiptServiceImpl implements ReceiptService {
                 if (countyMapList.size() == 1) {
                     countyMapGroup.put("groupNum", countyMapList.get(0).get("QR_CODE"));
                 } else {
-                    List<Integer> c = new ArrayList<>();
-                    List<Integer> nsList = new ArrayList<>();
+                    List<String> c = new ArrayList<>();
+                    List<String> nsList = new ArrayList<>();
                     for (int i = 0; i < countyMapList.size(); i++) {
                         /**
                          * 判断组号中时候含有历史回迁组
                          */
                         if ((((countyMapList.get(i)).get("QR_CODE")) + "").contains("L")) {
                             if ((((countyMapList.get(i)).get("QR_CODE")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("QR_CODE")) + "").substring(1, (((countyMapList.get(i)).get("QR_CODE")) + "").length())));
+                                nsList.add((((countyMapList.get(i)).get("QR_CODE")) + "").substring(1, (((countyMapList.get(i)).get("QR_CODE")) + "").length()));
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("QR_CODE")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("QR_CODE")) + "").substring(1, (((countyMapList.get(i)).get("QR_CODE")) + "").length())));
+                                nsList.add((((countyMapList.get(i)).get("QR_CODE")) + "").substring(1, (((countyMapList.get(i)).get("QR_CODE")) + "").length()));
                             }
                         }
                     }
-                    countyMapGroup.put("groupNum", createGroupNo(c, nsList));
+                    countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
                 }
                 countyMapGroup.put("countyCode", countyCode);
                 countyMapGroup.put("policeList", countyMapList);
@@ -454,12 +454,16 @@ public class ReceiptServiceImpl implements ReceiptService {
         return typeList;
     }
 
-    private String createGroupNo(List<Integer> c, List<Integer> nsList) {
+    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) {
-                if (nsList.get(i) + 1 == nsList.get(i + 1)) {
+                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) {