From f7ceedb0dd1ae4f424b00e0003f28bb010b09da9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 14:49:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SafetyCenterSubitemMapper.java | 5 +++- .../mapper/xml/SafetyCenterSubitemMapper.xml | 10 ++++++++ .../SafetyCenterSubitemContactsService.java | 13 +++++++++- .../service/SafetyCenterSubitemService.java | 25 +++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index eae688ee..8617b415 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -1,16 +1,19 @@ package com.jero.functionalsafetycenter.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author liJiaRao * @date 2024-06-12 16:40 */ public interface SafetyCenterSubitemMapper extends BaseMapper { IPage pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); + + List listByParentIdAndCompanyId(@Param("parentId") String parentId, @Param("companyId") String companyId); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index c857d363..c02750bf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -30,4 +30,14 @@ + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index 1803d487..67fb0da8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -1,9 +1,14 @@ package com.jero.functionalsafetycenter.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; + +import java.util.List; +import java.util.stream.Collectors; + /** * *@author liJiaRao @@ -11,5 +16,11 @@ import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; */ @Service public class SafetyCenterSubitemContactsService extends ServiceImpl { - + public void deleteBySubitemId(String subitemId){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); + List list = this.list(wrapper); + List idList = list.stream().map(SafetyCenterSubitemContacts::getId).collect(Collectors.toList()); + this.removeByIds(idList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index e2b7a2e2..229ebff7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import org.springframework.stereotype.Service; @@ -104,7 +105,21 @@ public class SafetyCenterSubitemService extends ServiceImpl subitemList = this.listByParentIdAndCompanyId(projectId, subitem.getCompanyId()); + for (SafetyCenterSubitem safetyCenterSubitem : subitemList) { + deleteById(safetyCenterSubitem.getId()); + } + } + //删除成员 this.removeById(id); + //删除联系人 + contactsService.deleteBySubitemId(id); } public void deleteByIds(List idList) { @@ -140,4 +155,14 @@ public class SafetyCenterSubitemService extends ServiceImpl listByParentIdAndCompanyId(String parentId,String companyId){ + return baseMapper.listByParentIdAndCompanyId(parentId,companyId); + } }