From f83ff9ceefedf3a109ed773028f8c2b6e4da3bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 14 Mar 2026 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96ncurl=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/mapper/BillManageMapper.java   |  2 ++
 .../persistence/BillManageImpl.java           | 24 ++++++++-----------
 .../resources/mapper/BillManageMapper.xml     | 10 +++++++-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java
index 9b56d9f1e..dd9602190 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java
@@ -31,4 +31,6 @@ public interface BillManageMapper extends BaseMapper<BillManage>
 
     String getServiceItemsCodeNc(@Param("name") String name);
 
+    String getNcUrl(@Param("interfaceType") String interfaceType,@Param("organizationName") String organizationName,@Param("organizationId") Long organizationId);
+
 }
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
index a2b4bc3e7..bc6f6ff75 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
@@ -192,13 +192,11 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                     count++;
                     List<Ysitem> ysitemList=new ArrayList<Ysitem>();
                     String url = "";
-                    SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
-                    query.setOrganizationId(reconciliation.getOrganizationId());
-                    query.setOrganizationName(reconciliation.getOrganizationName());
-                    query.setInterfaceType("nc");
-                    List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.queryList(query);
-                    if (urlList != null && urlList.size() > 0) {
-                        url = urlList.get(0).getInterfaceTypeValue();
+                    Long organizationId = reconciliation.getOrganizationId();
+                    String organizationName = reconciliation.getOrganizationName();
+                    String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId);
+                    if (ncUrl!=null&&ncUrl!="") {
+                        url = ncUrl;
                     } else {
                         throw new ServiceException("未找到该组织的推送地址!");
                     }
@@ -438,13 +436,11 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                     ReconciliationDTO  reconciliationDTO=new ReconciliationDTO();
                     reconciliationDTO.setInnerNumber(reconciliation.getBillNumber());
                     String url = "";
-                    SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
-                    query.setOrganizationId(reconciliation.getOrganizationId());
-                    query.setOrganizationName(reconciliation.getOrganizationName());
-                    query.setInterfaceType("nc");
-                    List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.queryList(query);
-                    if (urlList != null && urlList.size() > 0) {
-                        url = urlList.get(0).getInterfaceTypeValue();
+                    Long organizationId = reconciliation.getOrganizationId();
+                    String organizationName = reconciliation.getOrganizationName();
+                    String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId);
+                    if (ncUrl!=null&&ncUrl!="") {
+                        url = ncUrl;
                     } else {
                         throw new ServiceException("未找到该组织的推送地址!");
                     }
diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
index 24eaa4cc2..87586c3f0 100644
--- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
@@ -101,7 +101,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getServiceItemsCodeNc" parameterType="java.lang.String" resultType="java.lang.String">
-        SELECT SERVICE_ITEMS_CODE_NC FROM NGWL_TEST_SYSTEM."SERVICE_ITEMS_MANAGE" where DEL_FLAG = '0' and SERVICE_ITEMS_NAME = #{name} limit 1
+        SELECT SERVICE_ITEMS_CODE_NC FROM NGWL_TEST_SYSTEM."SERVICE_ITEMS_MANAGE" where DEL_FLAG = '1' and SERVICE_ITEMS_NAME = #{name} limit 1
+    </select>
+
+    <select id="getNcUrl" resultType="java.lang.String">
+        SELECT INTERFACE_TYPE_VALUE FROM NGWL_TEST_THIRDPARTY."SYS_DEPART_INTERFACE_INFO"
+        where DEL_FLAG = '1'
+          and organization_id = #{organizationId}
+          and organization_name = #{organizationName}
+          and interface_type = #{interfaceType} limit 1
     </select>
 
 </mapper>
\ No newline at end of file