diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
index ca5e85d..cc4dc6b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
@@ -19,7 +19,7 @@ public class ConSaleImportDto implements Serializable {
     @Alias("客户名称")
     private String clientName;
 
-    @Alias("优客项目编号")
+    @Alias("项目编号")
     private String contractNo;
 
     @Alias("订单编号")
@@ -31,13 +31,13 @@ public class ConSaleImportDto implements Serializable {
     @Alias("城市")
     private String city;
 
-    @Alias("发布开始时间")
+    @Alias("上刊时间")
     private String publishStartDate;
 
-    @Alias("发布结束时间")
+    @Alias("下刊时间")
     private String publishEndDate;
 
-    @Alias("发布周期（天）")
+    @Alias("周期")
     private Double publishCycle;
 
     @Alias("媒体类型")
@@ -49,7 +49,7 @@ public class ConSaleImportDto implements Serializable {
     @Alias("数量")
     private Double quantity;
 
-    @Alias("频次")
+    @Alias("发布频次")
     private String frequency;
 
     @Alias("刊例价")
@@ -64,10 +64,10 @@ public class ConSaleImportDto implements Serializable {
     @Alias("订单发布费")
     private Double mediaFee;
 
-    @Alias("订单制作费（修改字段）")
+    @Alias("订单制作费")
     private Double productionFee;
 
-    @Alias("订单总金额")
+    @Alias("合同金额")
     private Double totalAmount;
 
     @Alias("比稿")
@@ -103,12 +103,6 @@ public class ConSaleImportDto implements Serializable {
     @Alias("签订日期")
     private String signDate;
 
-    @Alias("合同附件")
-    private String contractAttachment;
-
-    @Alias("其他附件")
-    private String otherAttachment;
-
     @Alias("补充说明")
     private String notes;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseImportVO.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseImportVO.java
index 8589d4c..ec13d2f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseImportVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseImportVO.java
@@ -16,7 +16,7 @@ public class ConPurchaseImportVO {
     @Alias("客户名称")
     private String clientName;
 
-    @Alias("优客项目编号")
+    @Alias("项目编号")
     private String projNumber;
 
     @Alias("合同编号")
@@ -28,17 +28,17 @@ public class ConPurchaseImportVO {
     @Alias("城市")
     private String cityName;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Alias("发布开始时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Alias("上刊时间")
     private Date startTime;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Alias("发布结束时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Alias("下刊时间")
     private Date endTime;
 
-    @Alias("发布周期（天）")
+    @Alias("周期")
     private String publishDays;
 
     @Alias("媒体类型")
@@ -50,7 +50,7 @@ public class ConPurchaseImportVO {
     @Alias("采购数量")
     private String purchaseQuantity;
 
-    @Alias("频次")
+    @Alias("发布频次")
     private String frequency;
 
     @Alias("刊例价")
@@ -62,22 +62,22 @@ public class ConPurchaseImportVO {
     @Alias("折扣")
     private String discount;
 
-    @Alias("净价")
+    @Alias("媒体费")
     private String netPrice;
 
-    @Alias("净价单位")
+    @Alias("媒体费单位")
     private String netPriceUnit;
 
     @Alias("制作费")
     private String productionFee;
 
-    @Alias("合同总金额")
+    @Alias("合同金额")
     private Double contractMoney;
 
     @Alias("甲方名称")
     private String firstName;
 
-    @Alias("供应商名称")
+    @Alias("乙方名称")
     private String secondName;
 
     @Alias("媒介部门")
@@ -97,24 +97,6 @@ public class ConPurchaseImportVO {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date signTime;
 
-    @Alias("合同附件")
-    private String contractAccess;
-
-    @Alias("上刊")
-    private String upPrint;
-
-    @Alias("换刊")
-    private String exchangePrint;
-
-    @Alias("下刊")
-    private String nextPrint;
-
-    @Alias("媒体链条")
-    private String mediaLink;
-
-    @Alias("附件")
-    private String attachment;
-
     @Alias("状态")
     private String state;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java
index 8a64a9c..98990b9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java
@@ -171,15 +171,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
                 purchaseBo.setContractMoney(firstRow.getContractMoney());
                 purchaseBo.setInvoiceContent(firstRow.getInvoiceContent());
                 purchaseBo.setSignTime(firstRow.getSignTime());
-                purchaseBo.setUpPrint(firstRow.getUpPrint());
-                purchaseBo.setExchangePrint(firstRow.getExchangePrint());
-                purchaseBo.setNextPrint(firstRow.getNextPrint());
-                purchaseBo.setMediaLink(firstRow.getMediaLink());
                 purchaseBo.setFirstName(firstRow.getFirstName());
                 purchaseBo.setMediaDeptName(firstRow.getMediaDeptName());
-                purchaseBo.setSecondName(firstRow.getSecondName()); // 供应商名称（乙方名称）
-                purchaseBo.setTaxPoints(firstRow.getTaxPoints()); // 税率（税点）
-                purchaseBo.setMediaLink(firstRow.getMediaLink());
+                purchaseBo.setSecondName(firstRow.getSecondName());
+                purchaseBo.setTaxPoints(firstRow.getTaxPoints());
 
                 // 状态转换
                 String state = "生效".equals(firstRow.getState()) ? "1" : "0";
@@ -265,7 +260,12 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
         }
         // 城市
         if (StringUtils.isNotBlank(row.getCityName())) {
-            ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCityName())).stream().findFirst().orElse(null);
+            // 城市一般是按照XXX/XXX/XXX这样的规则
+            String targetWholeName = row.getCityName().replace("/", "，");
+
+            ConCity conCity = conCityMapper.selectOne(new LambdaQueryWrapper<ConCity>()
+                .eq(ConCity::getWholeName, targetWholeName));
+
             if (conCity != null) {
                 mediaBo.setCityId(conCity.getId());
                 mediaBo.setCityName(conCity.getCityName());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
index 7e4adbd..c9d7532 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
@@ -192,9 +192,14 @@ public class ConSaleServiceImpl implements IConSaleService {
 
             ConSaleMediaBo mediaBo = new ConSaleMediaBo();
 
-            // 根据城市名称查询城市ID
+            // 城市
             if (StringUtils.isNotBlank(row.getCity())) {
-                ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCity())).stream().findFirst().orElse(null);
+                // 城市一般是按照XXX/XXX/XXX这样的规则
+                String targetWholeName = row.getCity().replace("/", "，");
+
+                ConCity conCity = conCityMapper.selectOne(new LambdaQueryWrapper<ConCity>()
+                    .eq(ConCity::getWholeName, targetWholeName));
+
                 if (conCity != null) {
                     mediaBo.setCityId(conCity.getId());
                     mediaBo.setCityName(conCity.getCityName());