Merge branch 'refs/heads/test'

mhd-user-center/src/main/resources/bootstrap.yml

@@ -20,9 +20,7 @@ spring:
       discovery:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
+        server-addr: 10.33.0.129:6010
-        username: nacos
-        password: manhuoda@2023
         #线上正式环境
       #        server-addr: 10.102.192.5:6848
       #        username: nacos
@@ -30,9 +28,7 @@ spring:
       config:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
+        server-addr: 10.33.0.129:6010
-        username: nacos
-        password: manhuoda@2023
         #线上正式环境
         #        server-addr: 10.102.192.5:6848
         #        username: nacos

mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml

@@ -135,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             SUBJECT_NAME,AMOUNT,RATE
         FROM
-            RECONCILIATION_ACCOUNT
+            RECONCILIATION r left join RECONCILIATION_ACCOUNT acc on acc.RECONCILIATION_ID = r.RECONCILIATION_ID left join NGWL_TEST_WLHY.TMS_INVOICE_LIST tms on r.APPLY_NUMBER = tms.APPLY_NUMBER
         WHERE
-            RECONCILIATION_ID = #{invoiceId}
+            tms.ID =  #{invoiceId}
     </select>
 
     <select id="queryInvoiceList" resultType="com.linke.finance.domain.businessDocument.repository.po.BusinessDocumentPO" parameterType="com.linke.finance.domain.businessDocument.repository.todo.BusinessDocumentDO">