|
@@ -378,27 +378,23 @@ public class OwnMessageController extends BaseController {
|
|
|
|
|
|
List<PubFileInf> fileInfList = new ArrayList<>();
|
|
|
List<ZcFinanceContract> contractList = new ArrayList<>();
|
|
|
- if(contractIdList.size() < 1){
|
|
|
- return AjaxResult.success();
|
|
|
- }else{
|
|
|
- //查询合同
|
|
|
- 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);
|
|
|
- }
|
|
|
-
|
|
|
+ //查询合同
|
|
|
+ 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);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
for(int i = 0 ; i < fileInfList.size(); i++){
|
|
|
//判断是否为已盖章文件
|
|
|
LambdaQueryWrapper<ZcFinanceFileRel> fileRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
|