Browse Source

融信盖章,融资盖章修改

cuixq 3 years ago
parent
commit
77380b80e6

+ 26 - 23
sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -6,6 +6,7 @@ import com.huyi.service.base.service.*;
 import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
+import com.huyi.service.credit.service.OwnCreditService;
 import com.huyi.service.util.DocumentConstant;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -91,7 +92,9 @@ public class CreditHandleController extends BaseController {
     //往来账款服务类
     @Autowired
     private IZcBillInfService  billInfService;
-
+    //自写融信服务类
+    @Autowired
+    private OwnCreditService ownCreditService;
 
     /**
      * 融信确权
@@ -908,37 +911,32 @@ public class CreditHandleController extends BaseController {
         Map<String,Object> p = new HashMap<>();
         //文件信息
         List<Map<String,String>>  list  = new ArrayList<>();
-        List<PubFileInf>  fileInfList  = new ArrayList<>();
         p.put("list",list);
+        List<Map> fileInfList;
         if(contractIdList.size() < 1){
             return AjaxResult.success(p);
         }else{
             //查询合同
-            LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
-            contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
-            List<ZcFinanceContract>  contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
-            if(contractList.size() > 0 ){
-                //提取文件编号
-                List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
-                LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
-                fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
-                fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
-            }
-
+            Map contractMap =new HashMap();
+            contractMap.put("zfcId",contractIdList);
+            contractMap.put("zfcNode",code);
+            fileInfList =  ownCreditService.getContact(contractMap);
         }
         if(fileInfList.size() > 0 ){
-            //提取所有的文件url
-            List<String> urlList = CommonUtil.getIdFromList(fileInfList,"pfiFileUrl");
-            //提取文件名
-            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
-            for(int i =0 ; i < urlList.size() ;i++){
+//            //提取所有的文件url
+//            List<String> urlList = CommonUtil.getIdFromList(fileInfList,"pfiFileUrl");
+//            //提取文件名
+//            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"zfcName");
+//            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
+            for(int i =0 ; i < fileInfList.size() ;i++){
                 //替换word文档中的变量
                 //String directory = FileConstants.REMOTE_FILE_PATH;
+                Map<String,String> urlMap = fileInfList.get(i);
+
                 String directory = configService.selectConfigByKey("credit_file_path").getMsg();
                 //文件下载
-                String filePath = downloadFile(urlList.get(i),fileNameList.get(i));
+                String filePath = downloadFile(urlMap.get("pfiFileUrl"),urlMap.get("zfcName")+".docx");
+                System.out.println("文件下载======>"+filePath);
                 //往word中填充数据
                 Map<String,Object> ps = new HashMap<>();
                 //开立方
@@ -969,16 +967,21 @@ public class CreditHandleController extends BaseController {
                 ps.put(DocumentConstant.ZFI_PAYMENT_NUMBER,zfiPaymentNumber);
                 //承诺还款日
                 ps.put(DocumentConstant.EXPIRE_DATE,expireDateA);
+                System.out.println("/往word中填充数据======>"+ps);
                 //调用替换word中的变量
                 WordUtil.wordTemplate(filePath,filePath,ps);
+                System.out.println("/调用替换word中的变量======>"+ps);
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置
-                int index  = fileNameList.get(i).indexOf(".");
-                String fileName = fileNameList.get(i).substring(0,index);
+//                int index  = fileNameList.get(i).indexOf(".");
+//                System.out.println("/获取位置======>"+index);
+                String fileName = urlMap.get("zfcName");//fileNameList.get(i).substring(0,index);
+                System.out.println("/名称======>"+fileName);
                 //doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
                 WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
                 filePath = directory + fileName + currecntDate + ".pdf";
+                System.out.println("/名称======>"+fileName);
                 File pdfFile = new File(filePath);
                 FileInputStream inputFile = new FileInputStream(pdfFile);
                 byte[] buffer = new byte[(int)pdfFile.length()];

+ 15 - 29
sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -445,25 +445,14 @@ public class OwnMessageController extends BaseController {
                 contractIdList = CommonUtil.getIdFromList(proConRelsList,"zfpcrContractId");
             }
         }
-        List<PubFileInf>  fileInfList  = new ArrayList<>();
-        List<ZcFinanceContract>  contractList = new ArrayList<>();
+        List<Map> fileInfList  = new ArrayList<>();
         //该节点存在合同
         if(contractIdList.size() > 0){
             //查询合同
-            LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
-            contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
-            contractLambdaQueryWrapper.orderByAsc(ZcFinanceContract::getZfcFile);
-            contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
-            if(contractList.size() > 0 ){
-                //提取文件编号
-                List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
-                LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
-                fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
-                fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
-                fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
-            }
+            Map contractMap =new HashMap();
+            contractMap.put("zfcId",contractIdList);
+            contractMap.put("zfcNode",code);
+            fileInfList =  ownCreditService.getContact(contractMap);
         }
 
 
@@ -472,7 +461,7 @@ public class OwnMessageController extends BaseController {
             //判断是否为已盖章文件
             LambdaQueryWrapper<ZcFinanceFileRel> fileRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
             fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfiId);
-            fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrContractId, contractList.get(i).getZfcId());
+            fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrContractId, fileInfList.get(i).get("zfcId"));
             // 核心企业盖章
             /*if ("01".equals(tokenService.getLoginUser().getSysUser().getCompanyType())) {
                 // 查询融资企业是否盖章
@@ -499,7 +488,7 @@ public class OwnMessageController extends BaseController {
                 Long start = System.currentTimeMillis();
 
                 //文件下载
-                filePath = downloadFile(fileInfList.get(i).getPfiFileUrl(),fileInfList.get(i).getPfiFileName());
+                filePath = downloadFile(String.valueOf(fileInfList.get(i).get("pfiFileUrl")),String.valueOf(fileInfList.get(i).get("zfcName")+".docx"));
                 //获取结束时间
                 Long end = System.currentTimeMillis();
                 System.out.println("文件下载花费时间:"+(end-start));
@@ -544,11 +533,9 @@ public class OwnMessageController extends BaseController {
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置
-                int index  = fileInfList.get(i).getPfiFileName().lastIndexOf(".");
-                fileName = fileInfList.get(i).getPfiFileName().substring(0,index);
                // doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
-                WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
-                filePath = directory + fileName + currecntDate + ".pdf";
+                WordPdfUtil.doc2pdf(filePath,directory + String.valueOf(fileInfList.get(i).get("zfcName")) + currecntDate + ".pdf");
+                filePath = directory + String.valueOf(fileInfList.get(i).get("zfcName")) + currecntDate + ".pdf";
                 /**-------- word 转PDF 结束--------**/
                 // 是已盖章文件
             } else {
@@ -565,7 +552,7 @@ public class OwnMessageController extends BaseController {
             /**-------- 获取合同盖章关键字 开始--------**/
             //获取合同信息
             //获取合同的节点
-            String contractNode = contractList.get(i).getZfcNode();
+            String contractNode = String.valueOf(fileInfList.get(i).get("zfcNode"));
             //关键字
             String keyWords = "";
             //判断节点是否用,分割
@@ -578,7 +565,7 @@ public class OwnMessageController extends BaseController {
                         site = j;
                     }
                 }
-                String signKeyWord = contractList.get(i).getZfcSignKeyword();
+                String signKeyWord = String.valueOf(fileInfList.get(i).get("zfcSignKeyword"));
                 String [] arrKeyWord =  signKeyWord.split(",");
                 if(arr.length != arrKeyWord.length){
                     throw  new Exception("合同信息有误");
@@ -586,7 +573,7 @@ public class OwnMessageController extends BaseController {
                 keyWords = arrKeyWord[site];
 
             }else {
-                keyWords = contractList.get(i).getZfcSignKeyword();
+                keyWords =String.valueOf(fileInfList.get(i).get("zfcSignKeyword"));
             }
             if(CommonUtil.isEmpty(keyWords)){
                 throw  new Exception("获取关键字失败");
@@ -613,7 +600,7 @@ public class OwnMessageController extends BaseController {
             //platId
             String platId = configService.selectConfigByKey("cfca_platId").getMsg();
             Long startC = System.currentTimeMillis();
-            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",fileName,keyWords,"0","0","250","250",projectCode,filePath,new HttpConnector(jksPath,keyStorePassword, channel,platId));
+            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",String.valueOf(fileInfList.get(i).get("zfcName")),keyWords,"0","0","250","250",projectCode,filePath,new HttpConnector(jksPath,keyStorePassword, channel,platId));
             Long endC = System.currentTimeMillis();
             System.out.println("盖章花费时间:"+(endC-startC));
             /**-------- CFCA盖章 结束--------**/
@@ -645,11 +632,10 @@ public class OwnMessageController extends BaseController {
             //文件传输
             File file = new File(path + contractNo + ".pdf");
             FileInputStream input = new FileInputStream(file);
-            int index  = fileInfList.get(i).getPfiFileName().lastIndexOf(".");
 
 //            MultipartFile multipartFile =new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
             Long startE = System.currentTimeMillis();
-            MultipartFile multipartFile =new MockMultipartFile("file", fileInfList.get(i).getPfiFileName().substring(0,index)+".pdf", "text/plain", IOUtils.toByteArray(input));
+            MultipartFile multipartFile =new MockMultipartFile("file", String.valueOf(fileInfList.get(i).get("zfcName"))+".pdf", "text/plain", IOUtils.toByteArray(input));
             R<com.tianhu.system.api.domain.PubFileInf> fileResult = remoteFileService.uploadFile(multipartFile,"01", "02","00",companyId,token);
             Long endE = System.currentTimeMillis();
             System.out.println("文件上传服务器花费时间:"+(endE-startE));
@@ -660,7 +646,7 @@ public class OwnMessageController extends BaseController {
                 financeFileRel = new ZcFinanceFileRel();
                 financeFileRel.setZffrId(IdUtils.fastSimpleUUID());
                 financeFileRel.setZffrFinanceId(zfiId);
-                financeFileRel.setZffrContractId(contractList.get(i).getZfcId());
+                financeFileRel.setZffrContractId(String.valueOf(fileInfList.get(i).get("zfcId")));
                 // 已盖章文件
             } else {
                 // 修改zc_finance_file_rel 数据

+ 7 - 0
sc-service/src/main/java/com/huyi/service/credit/mapper/OwnCreditMapper.java

@@ -36,6 +36,13 @@ public interface OwnCreditMapper {
     List<Map> selectCreditLineList(Map map);
 
     /**
+     * 查询合同文件
+     * @param map
+     * @return
+     */
+    List<Map> getContact(Map map);
+
+    /**
      * 获取供应商开立的授信额度
      * @param map
      * @return

+ 7 - 0
sc-service/src/main/java/com/huyi/service/credit/service/OwnCreditService.java

@@ -32,6 +32,13 @@ public interface OwnCreditService {
      */
     List<Map> selectCreditLineList(Map map);
 
+    /**
+     * 查询合同文件
+     * @param map
+     * @return
+     */
+    List<Map> getContact(Map map);
+
 
     /**
      * 获取供应商的授信额度

+ 5 - 0
sc-service/src/main/java/com/huyi/service/credit/service/impl/OwnCreditServiceImpl.java

@@ -26,6 +26,11 @@ public class OwnCreditServiceImpl implements OwnCreditService {
     }
 
     @Override
+    public List<Map> getContact(Map map) {
+        return creditMapper.getContact(map);
+    }
+
+    @Override
     public List<Map> selectCreditLineList(Map map) {
         return creditMapper.selectCreditLineList(map);
     }

+ 28 - 41
sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.constant.FileConstants;
+import com.huyi.service.credit.service.OwnCreditService;
 import com.huyi.service.util.DocumentConstant;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
@@ -103,6 +104,9 @@ public class RecordSealController extends BaseController {
     //待办服务类
     @Autowired
     private  ISysNoticeService      sysNoticeService;
+    //自写融信服务类
+    @Autowired
+    private OwnCreditService ownCreditService;
 
     /**
      * 获取合同文件
@@ -240,38 +244,30 @@ public class RecordSealController extends BaseController {
         Map<String,Object> p = new HashMap<>();
         //文件信息
         List<Map<String,String>>  list  = new ArrayList<>();
-        List<PubFileInf>  fileInfList  = new ArrayList<>();
         p.put("list",list);
+        List<Map> fileInfList;
         if(contractIdList.size() < 1){
             return AjaxResult.success(p);
         }else{
             //查询合同
-            LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
-            contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
-            List<ZcFinanceContract>  contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
-            if(contractList.size() > 0 ){
-                //提取文件编号
-                List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
-                LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
-                fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
-                fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
-            }
+            Map contractMap =new HashMap();
+            contractMap.put("zfcId",contractIdList);
+            contractMap.put("zfcNode",code);
+            fileInfList =  ownCreditService.getContact(contractMap);
 
         }
         if(fileInfList.size() > 0 ){
             //提取所有的文件url
             List<String> urlList = CommonUtil.getIdFromList(fileInfList,"pfiFileUrl");
             //提取文件名
-            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
+            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"zfcName");
             for(int i =0 ; i < urlList.size() ;i++){
                 //TODO 文件路径需要修改
                 //替换word文档中的变量
                 //String directory = FileConstants.REMOTE_FILE_PATH;
                 String directory = configService.selectConfigByKey("credit_file_path").getMsg();
                 //文件下载
-                String filePath = downloadFile(urlList.get(i),fileNameList.get(i));
+                String filePath = downloadFile(urlList.get(i),fileNameList.get(i)+".docx");
                 //往word中填充数据
                 Map<String,Object> ps = new HashMap<>();
                 //开立方
@@ -481,24 +477,14 @@ public class RecordSealController extends BaseController {
             }
         }
 
-        List<PubFileInf>  fileInfList  = new ArrayList<>();
-        List<ZcFinanceContract>  contractList = new ArrayList<>();
+        List<Map> fileInfList  = new ArrayList<>();
+        //TODO  合同模板
         if(contractIdList.size() > 0){
             //查询合同
-            LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
-            contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
-            contractLambdaQueryWrapper.orderByAsc(ZcFinanceContract::getZfcFile);
-            contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
-            if(contractList.size() > 0 ){
-                //提取文件编号
-                List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
-                LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
-                fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
-                fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
-                fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
-            }
+            Map contractMap =new HashMap();
+            contractMap.put("zfcId",contractIdList);
+            contractMap.put("zfcNode",code);
+            fileInfList =  ownCreditService.getContact(contractMap);
         }
 //        if(contractIdList.size() < 1){
 //            return AjaxResult.success();
@@ -525,7 +511,7 @@ public class RecordSealController extends BaseController {
             //判断是否为已盖章文件
             LambdaQueryWrapper<ZcFinanceFileRel> fileRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
             fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfiId);
-            fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrContractId, contractList.get(i).getZfcId());
+            fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrContractId, fileInfList.get(i).get("zfcId"));
             List<ZcFinanceFileRel> financeFileList = financeFileRelService.findZcFinanceFileRels(fileRelLambdaQueryWrapper);
 //            LambdaQueryWrapper<ZcFinanceRecordFileRel> fileRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //            //融信id
@@ -545,7 +531,8 @@ public class RecordSealController extends BaseController {
                 //String directory = FileConstants.REMOTE_FILE_PATH;
                 String directory = configService.selectConfigByKey("credit_file_path").getMsg();
                 //文件下载
-                filePath = downloadFile(fileInfList.get(i).getPfiFileUrl(),fileInfList.get(i).getPfiFileName());
+                //TODO 合同模板名称
+                filePath = downloadFile(String.valueOf(fileInfList.get(i).get("pfiFileUrl")),String.valueOf(fileInfList.get(i).get("zfcName"))+".docx");
                 //往word中填充数据
                 Map<String,Object> ps = new HashMap<>();
                 //开立方
@@ -586,8 +573,8 @@ public class RecordSealController extends BaseController {
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置
-                int index  = fileInfList.get(i).getPfiFileName().lastIndexOf(".");
-                fileName = fileInfList.get(i).getPfiFileName().substring(0,index);
+                int index  = String.valueOf(fileInfList.get(i).get("zfcName")).lastIndexOf(".");
+                fileName =String.valueOf(fileInfList.get(i).get("zfcName")).substring(0,index);
 //                doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
                 WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
                 filePath = directory + fileName + currecntDate + ".pdf";
@@ -611,7 +598,7 @@ public class RecordSealController extends BaseController {
             /**-------- 获取合同盖章关键字 开始--------**/
             //获取合同信息
             //获取合同的节点
-            String contractNode = contractList.get(i).getZfcNode();
+            String contractNode =String.valueOf(fileInfList.get(i).get("zfcNode"));
             //关键字
             String keyWords = "";
             //判断节点是否用,分割
@@ -624,7 +611,7 @@ public class RecordSealController extends BaseController {
                         site = j;
                     }
                 }
-                String signKeyWord = contractList.get(i).getZfcSignKeyword();
+                String signKeyWord = String.valueOf(fileInfList.get(i).get("zfcSignKeyword"));
                 String [] arrKeyWord =  signKeyWord.split(",");
                 if(arr.length != arrKeyWord.length){
                     throw  new Exception("合同信息有误");
@@ -632,7 +619,7 @@ public class RecordSealController extends BaseController {
                 keyWords = arrKeyWord[site];
 
             }else {
-                keyWords = contractList.get(i).getZfcSignKeyword();
+                keyWords = String.valueOf(fileInfList.get(i).get("zfcSignKeyword"));
             }
             if(CommonUtil.isEmpty(keyWords)){
                 throw  new Exception("获取关键字失败");
@@ -685,8 +672,8 @@ public class RecordSealController extends BaseController {
             //文件传输
             File file = new File(path + contractNo + ".pdf");
             FileInputStream input = new FileInputStream(file);
-            int index  = fileInfList.get(i).getPfiFileName().lastIndexOf(".");
-            MultipartFile multipartFile =new MockMultipartFile("file", fileInfList.get(i).getPfiFileName().substring(0,index)+".pdf", "text/plain", IOUtils.toByteArray(input));
+            int index  = String.valueOf(fileInfList.get(i).get("zfcName")).lastIndexOf(".");
+            MultipartFile multipartFile =new MockMultipartFile("file", String.valueOf(fileInfList.get(i).get("zfcName")).substring(0,index)+".pdf", "text/plain", IOUtils.toByteArray(input));
             R<com.tianhu.system.api.domain.PubFileInf> fileResult = remoteFileService.uploadFile(multipartFile,"01", "02","00",companyId,token);
 
             ZcFinanceRecordFileRel recordFileRel =new ZcFinanceRecordFileRel();
@@ -697,7 +684,7 @@ public class RecordSealController extends BaseController {
                 recordFileRel.setZfrfrId(IdUtils.fastSimpleUUID());
                 //融资id
                 recordFileRel.setZfrfrFinanceId(zfrId);
-                recordFileRel.setZfrfrContractId(contractList.get(i).getZfcId());
+                recordFileRel.setZfrfrContractId(String.valueOf(fileInfList.get(i).get("zfcId")));
                 // 已盖章文件
 //            }
 //            else {

+ 23 - 1
sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -348,6 +348,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <!--查询合同关联-->
+    <select id="getContact" parameterType="map" resultType="map">
+        SELECT
+        c.zfc_id              'zfcId',
+        c.zfc_name            'zfcName',
+        c.zfc_node            'zfcNode',
+        c.zfc_sign_keyword    'zfcSignKeyword',
+        f.pfi_file_url        'pfiFileUrl'
+        FROM   zc_finance_contract c
+        left join pub_file_inf f
+        on  f.pfi_file_id = c.zfc_file
+        WHERE pfi_is_del ='00'
+         and c.zfc_id in
+        <foreach item="zfcId" collection="zfcId" open="(" separator="," close=")">
+            #{zfcId}
+        </foreach>
+        <if test="zfcNode != null  and zfcNode != ''">
+            AND c.zfc_node like concat('%', #{zfcNode}, '%')
+        </if>
+        order by f.pfi_file_id asc
+    </select>
+
     <update id="updateSupplierStatus" parameterType="map" >
        update
         zc_finance_inf
@@ -463,4 +485,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by f.create_time desc
 
     </select>
-</mapper>
+</mapper>