yzc 1 жил өмнө
parent
commit
5e83bd538f

+ 3 - 11
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -134,11 +134,11 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
      */
     @Override
     public AccountPaymentVo detail(Long id) {
-        AccountPayment AccountPayment = baseMapper.detail(id);
-        AccountPaymentVo result = BeanUtil.toBean(AccountPayment, AccountPaymentVo.class);
+        AccountPayment accountPayment = baseMapper.detail(id);
+        AccountPaymentVo result = BeanUtil.toBean(accountPayment, AccountPaymentVo.class);
 
         if (ObjectUtil.isNotEmpty(result.getAccountManagementId())) {
-            //查询实际打款的付款账户名称
+            //查询实际打款的付款账户名称
             AccountManagement accountManagement = accountManagementService.getById(result.getAccountManagementId());
             if (ObjectUtil.isNotEmpty(accountManagement)) {
                 result.setAccountManagementName(accountManagement.getName());
@@ -146,14 +146,6 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
 
         }
 
-        if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())) {
-            //查询业务中选中的付款账户名称;
-            AccountManagement accountManagement = accountManagementService.getById(result.getBusinessManagementId());
-            if (ObjectUtil.isNotEmpty(accountManagement)) {
-                result.setBusinessManagementName(accountManagement.getName());
-            }
-
-        }
         return result;
     }
 

+ 2 - 2
hx-account/src/main/resources/mapper/account/AccountRequestFundsDetailMapper.xml

@@ -50,9 +50,9 @@
     <select id="listByAccountRequestFundsId"
             resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo">
         SELECT arfd.*,
-               c.`code` contractCode
+               sc.`code` contractCode
         FROM account_request_funds_detail arfd
-                 LEFT JOIN bytesailing_sale.contract c ON arfd.contract_id = c.id
+                 LEFT JOIN bytesailing_jxst.sales_contract sc ON arfd.contract_id = sc.id
         WHERE arfd.account_request_funds_id = #{accountRequestFundsId}
     </select>