diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisWaybillCustomExportUtil.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisWaybillCustomExportUtil.java index 41c4ee3b9..6c4f2f8cc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisWaybillCustomExportUtil.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisWaybillCustomExportUtil.java @@ -75,8 +75,8 @@ public class EmisWaybillCustomExportUtil { // 报关收件人 (空) createCell(row, 2, "", dataStyle); - // 收件人 (receiveName) - createCell(row, 3, waybill.getReceiveName() != null ? waybill.getReceiveName() : "", dataStyle); + // 收件人 (receiveCompany) + createCell(row, 3, waybill.getReceiveCompany() != null ? waybill.getReceiveCompany() : "", dataStyle); // 英文收件人 (空) createCell(row, 4, "", dataStyle); @@ -101,8 +101,8 @@ public class EmisWaybillCustomExportUtil { // 收件人电话 (receiveMobile) createCell(row, 9, waybill.getReceiveMobile() != null ? waybill.getReceiveMobile() : "", dataStyle); - // 发件人 (sendName) - createCell(row, 10, waybill.getSendName() != null ? waybill.getSendName() : "", dataStyle); + // 发件人 (sendCompany) + createCell(row, 10, waybill.getSendCompany() != null ? waybill.getSendCompany() : "", dataStyle); // 发件人证件类型 (空) createCell(row, 11, "", dataStyle); @@ -257,7 +257,7 @@ public class EmisWaybillCustomExportUtil { } /** - * 构建完整地址(省·市·地址) + * 构建完整地址(省市地址直接拼接) */ private static String buildAddress(String province, String city, String address) { StringBuilder sb = new StringBuilder(); @@ -265,15 +265,9 @@ public class EmisWaybillCustomExportUtil { sb.append(province); } if (city != null && !city.trim().isEmpty()) { - if (sb.length() > 0) { - sb.append("·"); - } sb.append(city); } if (address != null && !address.trim().isEmpty()) { - if (sb.length() > 0) { - sb.append("·"); - } sb.append(address); } return sb.toString(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java index 96e085373..d3970e424 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java @@ -392,7 +392,8 @@ public class EmisQuotePriceServiceImpl extends EmisBaseService implements IEmisQ // 寄件区域 if (emisQuotePrice.getSendAreaName() != null && !emisQuotePrice.getSendAreaName().trim().isEmpty()) { EmisQuoteSendArea querySendArea = new EmisQuoteSendArea(); - querySendArea.setAreaName(emisQuotePrice.getSendAreaName()); + // 使用params进行精确查询,避免触发模糊查询 + querySendArea.getParams().put("areaName", emisQuotePrice.getSendAreaName()); querySendArea.setUseSiteCode(emisQuotePrice.getUseSiteCode()); List sendAreaList = emisQuoteSendAreaMapper.selectEmisQuoteSendAreaList(querySendArea); if (sendAreaList == null || sendAreaList.isEmpty()) { @@ -406,7 +407,8 @@ public class EmisQuotePriceServiceImpl extends EmisBaseService implements IEmisQ // 派件区域 if (emisQuotePrice.getDispAreaName() != null && !emisQuotePrice.getDispAreaName().trim().isEmpty()) { EmisQuoteDispArea queryDispArea = new EmisQuoteDispArea(); - queryDispArea.setAreaName(emisQuotePrice.getDispAreaName()); + // 使用params进行精确查询,避免触发模糊查询 + queryDispArea.getParams().put("areaName", emisQuotePrice.getDispAreaName()); queryDispArea.setUseSiteCode(emisQuotePrice.getUseSiteCode()); List dispAreaList = emisQuoteDispAreaMapper.selectEmisQuoteDispAreaList(queryDispArea); if (dispAreaList == null || dispAreaList.isEmpty()) {