From 4ad3f471ec7242bc63187855f2b691e13c0e35f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 28 Oct 2021 16:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=8C=E5=81=9A?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java    |  2 +-
 .../PayMemberProjectSubitemController.java    | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index b3065051..7d94d1de 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -1115,7 +1115,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         // 能关联上合同
         if(!Objects.isNull(payIncomeContract)){
             if(!Objects.equals(payIncomeContract.getSignedCompanyId(),companyId)){
-                throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配！");
+                throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配");
             }
             return payIncomeContract;
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 398db4c2..6597368b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.util.NumberUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -16,21 +18,25 @@ import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
-import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
+import com.jero.contract.entity.PayIncomeContract;
+import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectSubitemService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.vo.PayMemberProjectSubitemExcel;
+import com.jero.project.common.PayProjectCommon;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -54,6 +60,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     @Resource
     private IPayContactsManagementService contactsManagementService;
     @Resource
+    private IPayIncomeContractService payIncomeContractService;
+    @Resource
     private ISysBaseAPI sysBaseAPI;
 
     /**
@@ -206,6 +214,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     @AutoLog(value = "会员项目成员表-导入数据")
     @ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    @Transactional
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         String projectId = request.getParameter("projectId");
         if (StringUtils.isBlank(projectId)) {
@@ -253,6 +262,17 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             } else {
                 errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
             }
+            if (Objects.equals(Integer.parseInt(paymentTypeMap.get(paymentMethod)), PayProjectCommon.CHARGE_WAY2)) {
+                // 合同编号验证
+                LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper();
+                queryPayIncomeContract.eq(PayIncomeContract::getContractNum,projectSubitemExcel.getContractNo());
+                queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,projectSubitemExcel.getCompanyId());
+                List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
+                if(CollectionUtils.isEmpty(listPayIncomeContract)){
+                    errorMessage.add("第" + errorRowNum + "行:合同号不存在");
+                }
+            }
+
             //复制属性
             BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
 
@@ -266,7 +286,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         if (!errorMessage.isEmpty()) {
             StringBuilder msg = new StringBuilder();
             for (String s : errorMessage) {
-                msg.append(s).append("，请修改！<br/>");
+                msg.append(s).append(",请修改！<br/>");
             }
             throw new JeroBootException(msg.toString());
         }