From 1a7781f42c841692e63be90ed377fa25a47916e8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 18:30:52 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087907=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=88=90=E5=91=98-=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E5=90=8E=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5--=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=BA=94=E8=AF=A5=E4=B8=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=2087910=20=E6=89=80=E6=9C=89=E4=BC=9A=E8=AE=AE-?= =?UTF-8?q?=E5=B7=B2=E5=B0=81=E9=94=81=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8D=B4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=2087912=20=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98&=E5=B9=B4=E5=BA=A6=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4-=E9=94=81=E5=AE=9A=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5--=E4=BC=81=E4=B8=9A=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=BA=94=E8=AF=A5=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 2 +- .../PayDraftingGroupSubItemServiceImpl.java | 8 +++--- .../IPayMemberProjectSubitemService.java | 18 ++++++------- .../impl/PayPackCompanyServiceImpl.java | 6 ++--- .../impl/PayCommonProjectServiceImpl.java | 10 +++---- .../PayWorkingGroupSubItemServiceImpl.java | 10 +++---- ...yCompanyManagementTemporaryController.java | 26 +------------------ ...ContactsManagementTemporaryController.java | 26 ------------------- 8 files changed, 28 insertions(+), 78 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 deb9f6b7..4ce2e099 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 @@ -982,7 +982,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl subItemContacts = payDraftingGroupSubItemContactsMapper.getSubItemContacts(id); List temporaryIds = subItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(temporaryIds); + // paycontactsManagementTemporaryService.removeByIds(temporaryIds); } /** @@ -445,7 +445,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl list = payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList().stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(list); + // paycontactsManagementTemporaryService.removeByIds(list); } // 删除联系人记录 LambdaUpdateWrapper updatePayDraftingGroupSubItemContacts = new LambdaUpdateWrapper<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index f2eeb707..e59fbb62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -323,7 +323,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl update = new LambdaUpdateWrapper<>(); update.eq(PayPackCompanyProject::getProjectId,payMemberProjectSubitem.getId()); - payPackCompanyProjectService.remove(update); + //payPackCompanyProjectService.remove(update); // 删除企业联系人临时数据 - companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId()); - contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId())); + //companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId()); + // contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId())); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index 8c0ff914..64a81c7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -206,7 +206,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl subItemContacts = payWorkingGroupSubItemContactsMapper.getSubItemContacts(id); List temporaryIds = subItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(temporaryIds); + // paycontactsManagementTemporaryService.removeByIds(temporaryIds); } /** @@ -1466,7 +1466,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList().stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(list); + // paycontactsManagementTemporaryService.removeByIds(list); } // 删除联系人记录 LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); @@ -1501,7 +1501,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl delete(@RequestParam(name="id",required=true) String id) { - payCompanyManagementTemporaryService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @ApiOperation(value="pay_company_management_temporary-批量删除", notes="pay_company_management_temporary-批量删除") -// @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + /** * 通过id查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java index e9cb68c7..78541d1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java @@ -80,32 +80,6 @@ public class PayContactsManagementTemporaryController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - payContactsManagementTemporaryService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @ApiOperation(value="pay_contacts_management_temporary-批量删除", notes="pay_contacts_management_temporary-批量删除") -// @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - /** * 通过id查询 *