采购：内贸客户资信-打印

@@ -35,6 +35,8 @@ import java.io.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 @Api(tags = "采购内贸资信调查表")
 @Api(tags = "采购内贸资信调查表")
 @Validated
 @Validated
@@ -142,6 +144,25 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
 
                     Map<String, Object> dataMap = new HashMap<>();
                     Map<String, Object> dataMap = new HashMap<>();
+                    dataMap.put("purchaseDepartmentName", data.getPurchaseDepartmentName() == null ? "" : data.getPurchaseDepartmentName());
+                    String province = "";
+                    String city = "";
+                    if (data.getAddress() != null) {
+                        String address = data.getAddress();
+                        // 定义正则表达式，利用命名捕获组分别匹配省和市
+                        // (?<province>[^省]+省) 匹配以"省"结尾的省份（如：安徽省）
+                        // (?<city>[^市]+市)     匹配以"市"结尾的城市（如：合肥市）
+                        String regex = "(?<province>[^省]+省)(?<city>[^市]+市)";
+                        Pattern pattern = Pattern.compile(regex);
+                        Matcher matcher = pattern.matcher(address);
+                        if (matcher.find()) {
+                            province = matcher.group("province"); // 提取出 "安徽省"
+                            city = matcher.group("city");
+                        }
+                    }
+                    dataMap.put("province", province);
+                    dataMap.put("city", city);
+
                     dataMap.put("reviewDate", dateFormatter.format(data.getCreateTime()));
                     dataMap.put("reviewDate", dateFormatter.format(data.getCreateTime()));
                     dataMap.put("unitName", data.getUnitName() == null ? "" : data.getUnitName());
                     dataMap.put("unitName", data.getUnitName() == null ? "" : data.getUnitName());
                     String companyNature = "①、进口贸易□    ②、国内贸易□\n" +
                     String companyNature = "①、进口贸易□    ②、国内贸易□\n" +