From 1a53f10c643a02566b7d38874a796b3b6206e476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 19 Oct 2021 16:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40939?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaySpendingContractController.java        |  2 +-
 .../service/impl/PayMailBillServiceImpl.java  | 21 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
index dc1873e9..9e8d7f77 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
@@ -264,7 +264,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		String selections = request.getParameter("selections");
 		if (oConvertUtils.isNotEmpty(selections)) {
 			List<String> selectionList = Arrays.asList(selections.split(","));
-			exportList = pageList.stream().filter(item -> selectionList.contains(paySpendingContract.getId())).collect(Collectors.toList());
+			exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
 		} else {
 			exportList = pageList;
 		}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 431d1ae1..e921bbbc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -328,10 +328,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
                         return "开票金额大于当前未开票金额，输入有误！";
                     }
-                    PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
-                    if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
-                        return "企业未审核，需要审核后开票";
-                    }
                     break;
                 // 工作组项目
                 case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -353,10 +349,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
                         return "开票金额大于当前未开票金额，输入有误！";
                     }
-                    PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(workingGroup.getChargeCompanyTemporaryId());
-                    if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
-                        return "企业未审核，需要审核后开票";
-                    }
                     break;
                 //会议项目
                 case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -378,11 +370,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
                         return "开票金额大于当前未开票金额，输入有误！";
                     }
-                    // TODO 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以来款
-                    PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
-                    if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
-                        return "企业未审核，需要审核后开票";
-                    }
                     break;
                 //会员项目
                 case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -404,10 +391,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
                         return "开票金额大于当前未开票金额，输入有误！";
                     }
-                    PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(memberProject.getCompanyTemporaryId());
-                    if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
-                        return "企业未审核，需要审核后开票";
-                    }
                     break;
                 //标协会员
                 case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -429,10 +412,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
                         return "开票金额应等于当前未开票金额，输入有误！";
                     }
-                    PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
-                    if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
-                        return "企业未审核，需要审核后开票";
-                    }
                     break;
                 default:
                     break;