From 0486373d503713da2ecc6d0c1eb8af98cc7335cf Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Mon, 11 Apr 2022 14:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=90=88=E5=90=8C=E9=82=AE?= =?UTF-8?q?=E5=AF=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 8 ++++---- .../impl/PaySpendingContractServiceImpl.java | 19 ++++++++++++++++++- .../mail/mapper/PayMailContractMapper.java | 3 +++ .../mail/mapper/xml/PayMailContractMapper.xml | 3 +++ .../mail/service/IPayMailContractService.java | 3 +++ .../impl/PayMailContractServiceImpl.java | 6 ++++++ 6 files changed, 37 insertions(+), 5 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 64988783..afac15f7 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 @@ -799,10 +799,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayMailContract = new LambdaUpdateWrapper<>(); - updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId()); - payMailContractService.remove(updatePayMailContract); +// // 先删除 +// LambdaUpdateWrapper updatePayMailContract = new LambdaUpdateWrapper<>(); +// updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId()); +// payMailContractService.remove(updatePayMailContract); // 获取财务人员，发送消息 List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index c0a26fac..83586600 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; +import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.entity.PaySpendingContractAudit; import com.jero.contract.entity.PaySpendingContractInstallment; @@ -33,6 +34,7 @@ import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -801,8 +803,23 @@ public class PaySpendingContractServiceImpl extends ServiceImpl().isNull("contract_type")); payMailContractService.del(); - List list = paySpendingContractService.list(null); ArrayList arrayList = new ArrayList<>(); + List list2 = payMailContractService.selectAll(); + for(PayIncomeContract payIncomeContract:list2){ + PayMailContract payMailContract = new PayMailContract(); + PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContract.getSignedContactsTemporaryId()); + if(!Objects.isNull(payContactsManagementTemporary)){ + payMailContract.setMobile(payContactsManagementTemporary.getPhone()); + payMailContract.setEmail(payContactsManagementTemporary.getEmail()); + payMailContract.setLiaisonMan(payContactsManagementTemporary.getName()); + } + payMailContract.setContractId(payIncomeContract.getId()); + payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0); + payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE2); + arrayList.add(payMailContract); + } + List list = paySpendingContractService.list(null); + for(PaySpendingContract paySpendingContract:list){ PayMailContract payMailContract = new PayMailContract(); payMailContract.setContractId(paySpendingContract.getId()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java index 7a719c25..47c10341 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.contract.entity.PayIncomeContract; import com.jero.mail.entity.PayMailContracrList; import com.jero.mail.entity.PayMailContract; import org.apache.ibatis.annotations.Param; @@ -33,4 +34,6 @@ public interface PayMailContractMapper extends BaseMapper { void del(); + List selectAll(); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml index eabed5ed..b5a2057d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml @@ -146,4 +146,7 @@ pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java index 3b17ca2b..a44f1cb6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java @@ -5,6 +5,7 @@ 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.baomidou.mybatisplus.extension.service.IService; +import com.jero.contract.entity.PayIncomeContract; import com.jero.mail.entity.PayMailContracrList; import com.jero.mail.entity.PayMailContract; @@ -32,4 +33,6 @@ public interface IPayMailContractService extends IService { void del(); + List selectAll(); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java index 4cb67d91..ef882b2b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java @@ -4,6 +4,7 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.contract.entity.PayIncomeContract; import com.jero.mail.entity.PayMailContracrList; import com.jero.mail.entity.PayMailContract; import com.jero.mail.mapper.PayMailContractMapper; @@ -57,5 +58,10 @@ public class PayMailContractServiceImpl extends ServiceImpl selectAll() { + return payMailContractMapper.selectAll(); + } + }