ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/utils/IdCardProvinceUtil.java

@@ -108,9 +108,9 @@ public class IdCardProvinceUtil {
         map.put("63", "青海");
         map.put("64", "宁夏");
         map.put("65", "新疆");
-        map.put("71", "台湾");
-        map.put("81", "香港");
-        map.put("82", "澳门");
+        //map.put("71", "台湾");
+        //map.put("81", "香港");
+        // map.put("82", "澳门");
         // 91开头的为国外身份证件，无对应省份
         PROVINCE_MAP = Collections.unmodifiableMap(map);
 
@@ -220,7 +220,7 @@ public class IdCardProvinceUtil {
         cityMap.put("6530", "克孜勒苏"); cityMap.put("6531", "喀什"); cityMap.put("6532", "和田"); cityMap.put("6540", "伊犁");
         cityMap.put("6542", "塔城"); cityMap.put("6543", "阿勒泰"); cityMap.put("6590", "自治区直辖县级");
         // 港澳台
-        cityMap.put("7100", "台湾"); cityMap.put("8100", "香港"); cityMap.put("8200", "澳门");
+        // cityMap.put("7100", "台湾"); cityMap.put("8100", "香港"); cityMap.put("8200", "澳门");
         CITY_MAP = Collections.unmodifiableMap(cityMap);
     }
 
@@ -243,7 +243,7 @@ public class IdCardProvinceUtil {
             return "台湾";
         }*/
 
-        if ("中国台湾".equals(nationalityName)) {
+        /*if ("中国台湾".equals(nationalityName)) {
             return "台湾";
         }
 
@@ -253,9 +253,9 @@ public class IdCardProvinceUtil {
 
         if (nationalityName.contains("澳门")) {
             return "澳门";
-        }
+        }*/
 
-        if (credentialType == null) {
+        if (credentialType == null && !"中国".equals(nationalityName)) {
             return "";
         }
 

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/VoyageStockBoardMapper.xml

@@ -426,7 +426,7 @@
         SELECT
             pv.id as voyageId,
             pv.name as voyageName,
-            pv.start_time as startTime,
+            pv.boarding_time as startTime,
             rs.name as shipName,
             rr.direction as direction,
             CASE rr.direction