From fa0dc4b3c5eafaa176d724330d49909efdae367f Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Wed, 15 Dec 2021 10:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86-=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyAndContactsManagement.java | 3 ++ .../company/entity/PayContactsManagement.java | 3 ++ .../PayContactsManagementServiceImpl.java | 3 ++ .../PayIncomeContractController.java | 2 +- .../PaySpendingContractController.java | 2 +- .../impl/PayIncomeContractServiceImpl.java | 52 +++++++++++++------ 6 files changed, 48 insertions(+), 17 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyAndContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyAndContactsManagement.java index 1cc4f8fd..4a26ad26 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyAndContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyAndContactsManagement.java @@ -21,6 +21,9 @@ public class PayCompanyAndContactsManagement implements Serializable { /**企业名称*/ @ApiModelProperty(value = "企业名称") private String companyName; + /**用户名用于会员系统使用*/ + @ApiModelProperty(value = "用户名用于会员系统使用") + private String username; /**公司地址*/ @ApiModelProperty(value = "公司地址") private String companyAddress; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index da9920d9..d9089ca9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -49,6 +49,9 @@ public class PayContactsManagement implements Serializable { @Excel(name = "企业名称", width = 15) @ApiModelProperty(value = "企业名称") private String companyName; + /**用户名用于会员系统使用*/ + @ApiModelProperty(value = "用户名用于会员系统使用") + private String username; /**姓名*/ @Excel(name = "姓名", width = 15) @ApiModelProperty(value = "姓名") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 887b3a41..69776c39 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -200,6 +200,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl cancellation(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { 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 8d0a4668..ad449af0 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 @@ -184,7 +184,7 @@ public class PaySpendingContractController extends JeroController cancellation(@RequestBody PaySpendingContractAudit paySpendingContractAudit) { 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 5092fefa..a251a8cc 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 @@ -1,7 +1,6 @@ package com.jero.contract.service.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -14,7 +13,6 @@ import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; -import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; @@ -116,8 +114,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContract = new LambdaUpdateWrapper<>(); updatePayIncomeContract.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); updatePayIncomeContract.set(PayIncomeContract::getUpdateTime,new Date()); @@ -783,6 +779,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayMailContract = new LambdaUpdateWrapper<>(); + updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId()); + payMailContractService.remove(updatePayMailContract); // 更新到合同邮寄表 PayMailContract payMailContract = new PayMailContract(); PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractNew.getSignedContactsTemporaryId()); @@ -794,6 +794,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); if(!CollectionUtils.isEmpty(list)){ @@ -1032,6 +1033,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl listProject = payIncomeContractService.getAssociated(id); + if(!CollectionUtils.isEmpty(listProject)){ + listProject.forEach(p->{ + PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated(); + payIncomeContractAssociated.setId(p.getId()); + payIncomeContractAssociated.setContractId(p.getContractId()); + cancelAssociated(payIncomeContractAssociated); + }); } payIncomeContractService.removeById(id); LambdaUpdateWrapper updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>(); @@ -1143,6 +1151,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContractAudit = new LambdaUpdateWrapper<>(); updatePayIncomeContractAudit.eq(PayIncomeContractAudit::getContractId,id); payIncomeContractAuditService.remove(updatePayIncomeContractAudit); + LambdaUpdateWrapper updatePayMailContract = new LambdaUpdateWrapper<>(); + updatePayMailContract.eq(PayMailContract::getContractId,id); + payMailContractService.remove(updatePayMailContract); } @Override @@ -1161,10 +1172,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ + List listProject = payIncomeContractService.getAssociated(p.getId()); + if(!CollectionUtils.isEmpty(listProject)){ + listProject.forEach(item->{ + PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated(); + payIncomeContractAssociated.setId(p.getId()); + payIncomeContractAssociated.setContractId(item.getContractId()); + cancelAssociated(payIncomeContractAssociated); + }); + } + }); payIncomeContractService.removeByIds(ids); LambdaUpdateWrapper updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>(); updatePayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids); @@ -1182,6 +1201,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContractAudit = new LambdaUpdateWrapper<>(); updatePayIncomeContractAudit.in(PayIncomeContractAudit::getContractId,ids); payIncomeContractAuditService.remove(updatePayIncomeContractAudit); + LambdaUpdateWrapper updatePayMailContract = new LambdaUpdateWrapper<>(); + updatePayMailContract.in(PayMailContract::getContractId,ids); + payMailContractService.remove(updatePayMailContract); } @Override