1、账户流水页面增加“销售合同号”展示；

2、合同号允许点击打开对应合同的 pdf 页面；

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -92,4 +92,9 @@ public class AccountRunningWaterVo extends AccountRunningWater {
      * 资金账户账户
      */
     private String accountManagementOpening;
+
+    /**
+     * 订单编码集合
+     */
+    private String contractCodes;
 }

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
+    <!--这段代码正常是不需要跨库查询的。但是一开始封装包的时候分装的不合理，pom里面包是不能互相引用的。account包继承sale包会出现依赖冲突，目前不好改动，只能跨库查询-->
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         select arw.*,
+               (select GROUP_CONCAT(t4.`code`) from account_payment t1
+                LEFT JOIN account_request_funds t2 ON t1.business_id = t2.id
+                LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
+                LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
+                WHERE t1.id = arw.business_id
+               ) AS contractCodes
                am.alias accountManagementName,
                am.corporation_id
         from account_running_water arw

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -1,5 +1,7 @@
 package com.fjhx.sale.controller.contract;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
@@ -12,6 +14,7 @@ import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.*;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -102,8 +105,15 @@ public class ContractController {
      * 销售合同pdf
      */
     @PostMapping("/getContractPdfInfo")
-    public ContractPdfInfoVo getContractPdfInfo(@RequestBody BaseSelectDto dto) {
-        return contractService.getContractPdfInfo(dto.getId());
+    public ContractPdfInfoVo getContractPdfInfo(@RequestBody ContractDto dto) {
+        Long id;
+        if(StringUtils.isNotEmpty(dto.getCode())){
+            Contract contract = contractService.getOne(Wrappers.<Contract>query().lambda().eq(Contract::getCode,dto.getCode()).last("limit 1"));
+            id = ObjectUtils.isEmpty(contract)?0:contract.getId();
+        }else{
+            id = dto.getId();
+        }
+        return contractService.getContractPdfInfo(id);
     }
 
     /**