From edd6ca1ddc0192fc5c29543722fb0cf49cf505e1 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 21 Feb 2024 17:25:21 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-21=20=E7=89=A9=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/part/entity/PartInformationEntity.java | 2 +-
 .../part/service/impl/PartInformationServiceImpl.java     | 8 ++++----
 .../com/spring/modules/part/vo/PartInformationVo.java     | 2 +-
 src/main/resources/mapper/part/PartInformationMapper.xml  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
index 250dd990..2b7273f5 100644
--- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
@@ -157,7 +157,7 @@ public class PartInformationEntity extends QueryPage implements Serializable {
     /**
      * 原产地
      **/
-    private String isoCountry;
+    private String countryOfOrigin;
     /**
      * 制造提前期
      **/
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index a3e17629..56a55318 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -197,7 +197,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String assetClass = inData.getAssetClass();
         String partStatus = inData.getPartStatus();
         String abcClass = inData.getAbcClass();
-        String isoCountry = inData.getIsoCountry();
+        String countryOfOrigin = inData.getCountryOfOrigin();
         String regionOfOrigin = inData.getRegionOfOrigin();
         String customsStarNo = inData.getCustomsStarNo();
         String partCostGroupId = inData.getPartCostGroupId();
@@ -218,7 +218,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(assetClass);
         params.add(partStatus);
         params.add(abcClass);
-        params.add(isoCountry);
+        params.add(countryOfOrigin);
         params.add(regionOfOrigin);
         params.add(customsStarNo);
         params.add(partCostGroupId);
@@ -305,7 +305,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String assetClass = inData.getAssetClass();
         String partStatus = inData.getPartStatus();
         String abcClass = inData.getAbcClass();
-        String isoCountry = inData.getIsoCountry();
+        String countryOfOrigin = inData.getCountryOfOrigin();
         String regionOfOrigin = inData.getRegionOfOrigin();
         String customsStarNo = inData.getCustomsStarNo();
         String partCostGroupId = inData.getPartCostGroupId();
@@ -326,7 +326,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(assetClass);
         params.add(partStatus);
         params.add(abcClass);
-        params.add(isoCountry);
+        params.add(countryOfOrigin);
         params.add(regionOfOrigin);
         params.add(customsStarNo);
         params.add(partCostGroupId);
diff --git a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
index a97a8224..d25433d5 100644
--- a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
+++ b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
@@ -96,7 +96,7 @@ public class PartInformationVo extends PartInformationEntity {
     /**
      * 原产地名称
      **/
-    private String isoCountryDesc;
+    private String countryOfOriginDesc;
     /**
      * 地区名称
      **/
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index fbf063eb..95e49070 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -48,8 +48,8 @@
             dbo.get_abcClass_name(site, abc_class) as abcClassDesc,
             frequency_class,
             lifecycle_stage,
-            iso_country,
-            dbo.get_iso_country_name(site, iso_country) as isoCountryDesc,
+            country_of_origin,
+            dbo.get_country_of_origin_name(site, country_of_origin) as countryOfOriginDesc,
             manufacturing_lead_time,
             expected_lead_time,
             region_of_origin,
@@ -708,8 +708,8 @@
         dbo.get_abcClass_name(site, abc_class) as abcClassDesc,
         frequency_class,
         lifecycle_stage,
-        iso_country,
-        dbo.get_iso_country_name(site, iso_country) as isoCountryDesc,
+        country_of_origin,
+        dbo.get_country_of_origin_name(site, country_of_origin) as countryOfOriginDesc,
         manufacturing_lead_time,
         expected_lead_time,
         region_of_origin,