|
|
@@ -1298,6 +1298,8 @@ public class OwnCreditController extends BaseController {
|
|
|
List<PubFileInf> contractFileList = new ArrayList<>();
|
|
|
//收付款的其他文件
|
|
|
List<PubFileInf> otherFileList = new ArrayList<>();
|
|
|
+ //收付款的物流文件
|
|
|
+ List<PubFileInf> logisticsFileList = new ArrayList<>();
|
|
|
Map map = new HashMap();
|
|
|
//获取传过来的收付款信息
|
|
|
List<Map<String,String>> ticketList = (List<Map<String, String>>) m.get("ticketList");
|
|
|
@@ -1308,6 +1310,8 @@ public class OwnCreditController extends BaseController {
|
|
|
map.put("contractFileList",contractFileList);
|
|
|
//其他类型
|
|
|
map.put("otherFileList",otherFileList);
|
|
|
+ //物流附件
|
|
|
+ map.put("logisticsFileList",logisticsFileList);
|
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
|
|
|
|
@@ -1373,6 +1377,23 @@ public class OwnCreditController extends BaseController {
|
|
|
|
|
|
}
|
|
|
map.put("otherFileList",otherFileList);
|
|
|
+ //查询物流附件
|
|
|
+ LambdaQueryWrapper<ZcBillFileRel> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(ZcBillFileRel::getZbfrBillId,zbiIdList);
|
|
|
+ queryWrapper.eq(ZcBillFileRel::getZbfrType,"1");
|
|
|
+ List<ZcBillFileRel> wlFileList = billFileRelService.findZcBillFileRels(queryWrapper);
|
|
|
+ //不为空
|
|
|
+ if(wlFileList.size() > 0){
|
|
|
+ //提取文件编号
|
|
|
+ List<String> idList = CommonUtil.getIdFromList(wlFileList,"zbfrFileId");
|
|
|
+ LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,idList);
|
|
|
+ fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
|
|
|
+ logisticsFileList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
|
|
|
+
|
|
|
+ }
|
|
|
+ map.put("logisticsFileList",logisticsFileList);
|
|
|
+
|
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
|
|