增加导出物流附件

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -746,6 +746,8 @@ public class FinanceRecordController extends BaseController {
         List<PubFileInf> invoiceFileList = new ArrayList<>();
         //收付款的合同类型的文件
         List<PubFileInf> contractFileList = new ArrayList<>();
+        //物流文件
+        List<PubFileInf> logisticsList = new ArrayList<>();
         //收付款的其他文件
         List<PubFileInf> otherFileList = new ArrayList<>();
         //融信相关文件
@@ -805,6 +807,20 @@ public class FinanceRecordController extends BaseController {
             fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
             otherFileList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
         }
+        //查询物流文件
+        LambdaQueryWrapper<ZcBillFileRel>  fileRelQueryWrapper = new LambdaQueryWrapper<>();
+        fileRelQueryWrapper.in(ZcBillFileRel::getZbfrBillId,zbiIdList);
+        fileRelQueryWrapper.eq(ZcBillFileRel::getZbfrType,"1");
+        List<ZcBillFileRel> fileList =  billFileRelService.findZcBillFileRels(fileRelQueryWrapper);
+        if(fileList.size() > 0){
+            //提取文件编号
+            List<String> idList = CommonUtil.getIdFromList(fileList,"zbfrFileId");
+            LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,idList);
+            fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
+            logisticsList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
+        }
+
         //融信附件关联表
         LambdaQueryWrapper<ZcFinanceFileRel> financeFileRelWrapper = new LambdaQueryWrapper<>();
         financeFileRelWrapper.in(ZcFinanceFileRel::getZffrFinanceId,zfrFinanceId);
@@ -841,6 +857,17 @@ public class FinanceRecordController extends BaseController {
             map.put("pfiFileName",pfiFileName);
             list.add(map);
         }
+        //物流文件
+        for (int i = 0; i < logisticsList.size(); i++) {
+            Map map = new HashMap();
+            //文件路径
+            String pfiFileUrl = logisticsList.get(i).getPfiFileUrl();
+            //文件名称
+            String pfiFileName = logisticsList.get(i).getPfiFileName();
+            map.put("pfiFileUrl",pfiFileUrl);
+            map.put("pfiFileName",pfiFileName);
+            list.add(map);
+        }
         for (int j = 0; j < contractFileList.size(); j++) {
             Map map = new HashMap();
             //文件路径