From 8c3d44d7da8bb78c8274c6e76e2615dae43f8482 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Thu, 7 May 2026 18:49:37 +0800
Subject: [PATCH] =?UTF-8?q?OMS-GW-=E4=BC=81=E4=B8=9A=E5=9B=BD=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erpCountry/ErpCountryApplicationService.java     |  4 ++++
 .../mhd/oms/domain/erpCountry/entity/ErpCountry.java |  6 ------
 .../interfaces/facade/erpCountry/ErpCountryApi.java  | 11 +++++++++++
 .../resources/mapper/erpCountry/ErpCountryMapper.xml | 12 +++++-------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java
index 1a6e1a377..ef545052f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java
@@ -181,4 +181,8 @@ public class ErpCountryApplicationService{
         }
         erpCountryMapper.updateById(entity);
     }
+
+    public ErpCountry getById(Long id) {
+        return erpCountryMapper.selectById(id);
+    }
 }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/erpCountry/entity/ErpCountry.java b/mhd_oms/src/main/java/com/mhd/oms/domain/erpCountry/entity/ErpCountry.java
index 9aa16f177..2bbb7b0cf 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/erpCountry/entity/ErpCountry.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/erpCountry/entity/ErpCountry.java
@@ -29,9 +29,6 @@ public class ErpCountry implements Serializable {
     @ApiModelProperty("ERP国别名称")
     private String erpCountryName;
 
-    @ApiModelProperty("备注")
-    private String remark;
-
     @ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
     private Integer pushStatus;
 
@@ -55,9 +52,6 @@ public class ErpCountry implements Serializable {
     @ApiModelProperty("创建人")
     private Long createBy;
 
-    @ApiModelProperty("创建人姓名")
-    private String createByName;
-
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
index afdd6e8c9..fb5c8beb2 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpCountry/ErpCountryApi.java
@@ -5,6 +5,7 @@ import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.oms.application.service.erpCountry.ErpCountryApplicationService;
+import com.mhd.oms.domain.erpCountry.entity.ErpCountry;
 import com.mhd.oms.interfaces.dto.erpCountry.ErpCountryDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,4 +60,14 @@ public class ErpCountryApi extends BaseController{
         return erpCountryApplicationService.batchPush(dtoList);
     }
 
+    @ApiOperation("获取企业国别详情")
+    @GetMapping("/getInfo")
+    public AjaxResult getInfo(Long id) {
+        if (id == null) {
+            return AjaxResult.error("ID不能为空");
+        }
+        ErpCountry erpCountry = erpCountryApplicationService.getById(id);
+        return AjaxResult.success(erpCountry);
+    }
+
 }
diff --git a/mhd_oms/src/main/resources/mapper/erpCountry/ErpCountryMapper.xml b/mhd_oms/src/main/resources/mapper/erpCountry/ErpCountryMapper.xml
index d3ac78fc3..e56558ea3 100644
--- a/mhd_oms/src/main/resources/mapper/erpCountry/ErpCountryMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/erpCountry/ErpCountryMapper.xml
@@ -3,22 +3,20 @@
 <mapper namespace="com.mhd.oms.domain.erpCountry.repository.mapper.ErpCountryMapper">
 
     <select id="queryList" resultType="com.mhd.oms.domain.erpCountry.repository.po.ErpCountryPO">
-        SELECT ID, ERP_COUNTRY_CODE, ERP_COUNTRY_NAME, REMARK, PUSH_STATUS, PUSH_TIME, PUSH_BY,
-        ORGANIZATION_ID, TOP_ORGANIZATION_ID, ORGANIZATION_NAME,
-        CREATE_BY, CREATE_BY_NAME, CREATE_TIME, UPDATE_BY, UPDATE_BY_NAME, UPDATE_TIME, DEL_FLAG
+        SELECT *
         FROM ERP_COUNTRY
         WHERE DEL_FLAG = 1
         <if test="erpCountryDTO.pushStatus != null">
-            AND PUSH_STATUS = #{dto.pushStatus}
+            AND PUSH_STATUS = #{erpCountryDTO.pushStatus}
         </if>
         <if test="erpCountryDTO.pushTimeFrom != null and erpCountryDTO.pushTimeFrom != ''">
-            AND DATE_FORMAT(PUSH_TIME, '%Y-%m-%d') &gt;= #{dto.pushTimeFrom}
+            AND DATE_FORMAT(PUSH_TIME, '%Y-%m-%d') &gt;= #{erpCountryDTO.pushTimeFrom}
         </if>
         <if test="erpCountryDTO.pushTimeTo != null and erpCountryDTO.pushTimeTo != ''">
-            AND DATE_FORMAT(PUSH_TIME, '%Y-%m-%d') &lt;= #{dto.pushTimeTo}
+            AND DATE_FORMAT(PUSH_TIME, '%Y-%m-%d') &lt;= #{erpCountryDTO.pushTimeTo}
         </if>
         <if test="erpCountryDTO.organizationId != null">
-            AND ORGANIZATION_ID = #{dto.organizationId}
+            AND ORGANIZATION_ID = #{erpCountryDTO.organizationId}
         </if>
         ORDER BY CREATE_TIME DESC
     </select>