From e99bb50480721032f52a53167e4849d2905d3a32 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, 9 Sep 2021 17:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemServiceImpl.java    | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index fce5471a..c4b69e32 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -1,6 +1,7 @@
 package com.jero.project.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
@@ -124,10 +125,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             log.info("工作组成员-添加异常",e);
             throw new JeroBootException("工作组成员单位已存在！");
         }
-        // 来款方式为合同，校验合同编号
-        if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
-            payIncomeContractService.checkContractNum(payWorkingGroupSubItem.getContractNum());
-        }
+
         payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
         payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
         payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0);
@@ -135,6 +133,20 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         payWorkingGroupSubItem.setMail(PayProjectCommon.MAIL0);
         payWorkingGroupSubItem.setChargeUse(PayProjectCommon.CHARGE_USE1);
         payWorkingGroupSubItemService.save(payWorkingGroupSubItem);
+
+        PayIncomeContract payIncomeContract = null;
+        // 来款方式为合同，校验合同编号
+        if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+            payIncomeContract = payIncomeContractService.setPayIncomeContractAssociated(payWorkingGroupSubItem.getContractNum(),payWorkingGroupSubItem.getChargeCompanyId(),payWorkingGroupSubItem.getId());
+        }
+        // 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
+        if(!Objects.isNull(payIncomeContract) && Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
+            LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
+            update.eq(PayWorkingGroupSubItem::getId,payWorkingGroupSubItem.getId());
+            update.set(PayWorkingGroupSubItem::getPack,PayProjectCommon.PACKAGING1);
+            payWorkingGroupSubItemService.update(update);
+            // todo 缺少添加打包功能
+        }
     }
 
     @Override
@@ -176,9 +188,24 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             log.info("工作组成员-编辑异常",e);
             throw new JeroBootException("工作组成员单位已存在！");
         }
+        // 校验项目是否已关联合同
+        PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payWorkingGroupSubItem.getId());
+        if(!Objects.isNull(payIncomeContract) && !Objects.equals(payIncomeContract.getContractNum(),payWorkingGroupSubItem.getContractNum())){
+            throw new JeroBootException("项目已关联合同，合同编号不可修改！");
+        }
+
+        PayIncomeContract payIncomeContractAdd = null;
         // 来款方式为合同，校验合同编号
         if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
-            payIncomeContractService.checkContractNum(payWorkingGroupSubItem.getContractNum());
+            payIncomeContractAdd = payIncomeContractService.setPayIncomeContractAssociated(payWorkingGroupSubItem.getContractNum(),payWorkingGroupSubItem.getChargeCompanyId(),payWorkingGroupSubItem.getId());
+        }
+        // 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
+        if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){
+            LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
+            update.eq(PayWorkingGroupSubItem::getId,payWorkingGroupSubItem.getId());
+            update.set(PayWorkingGroupSubItem::getPack,PayProjectCommon.PACKAGING1);
+            payWorkingGroupSubItemService.update(update);
+            // todo 缺少添加打包功能
         }
         payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
         payWorkingGroupSubItem.setChargeUse(PayProjectCommon.CHARGE_USE1);