交接单 港澳台证合并在一起

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

@@ -396,6 +396,19 @@ public class ReceiptServiceImpl implements ReceiptService {
                 typeMap.put(o.get("CARD_TYPE") + "", mapList);
             }
         }
+        //将港澳台证合在一起
+        List<Map<String, Object>> list = new ArrayList<>();
+        if(typeMap.containsKey("港澳证") && typeMap.containsKey("台湾证")){
+            for (Map<String, Object> map : (List<Map<String, Object>>)typeMap.get("港澳证")){
+                list.add(map);
+            }
+            for (Map<String, Object> map : (List<Map<String, Object>>)typeMap.get("台湾证")){
+                list.add(map);
+            }
+            typeMap.put("港澳台证",list);
+            typeMap.remove("港澳证");
+            typeMap.remove("台湾证");
+        }
         //将已按制证分好的Map 再次细化分为任务单Map
         for (String type : typeMap.keySet()) {
             List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
@@ -435,12 +448,12 @@ public class ReceiptServiceImpl implements ReceiptService {
                         case "9":
                             countyName = "北京市公安局";
                             break;
-                        case "7":
-                            countyName ="台湾证"+countyMap.get("COUNTYNAME");
-                            break;
-                        case "5":
-                            countyName ="港澳证"+countyMap.get("COUNTYNAME");
-                            break;
+//                        case "7":
+//                            countyName ="港澳台证"+countyMap.get("COUNTYNAME");
+//                            break;
+//                        case "5":
+//                            countyName ="港澳台证"+countyMap.get("COUNTYNAME");
+//                            break;
                         default:
                             countyName = "" + countyMap.get("COUNTYNAME");
                     }

src/main/resources/application.yml

@@ -13,8 +13,6 @@ spring:
       max-file-size: 20MB
       max-request-size: 2000MB
 
-
-
 mybatis:
   type-aliases-package: com.yxproject.start.entity
   #加载Mybatis配置文件