From f1f8847bfea9d8e4a6df982b6ead9d8e658de248 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 14 Oct 2024 10:26:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E5=B7=A5=E3=80=81=E6=8B=BC?= =?UTF-8?q?=E7=AE=B1=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/RelCodeBatchController.java | 16 ++++++++++++++ .../service/collect/RelCodeBatchService.java | 22 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index ef2b7b80d..b854a721b 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -9,6 +9,7 @@ import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.req.collect.RelCodeBatchRequest; +import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.RelCodeBatchResponse; import com.glxp.api.service.collect.RelCodeBatchService; @@ -95,4 +96,19 @@ public class RelCodeBatchController extends BaseController { return ResultVOUtils.success("修改成功!"); } + + + @GetMapping("/udiwms/relCode/batch/deleteDetail") + public BaseResponse deleteDetail(@RequestParam("curCode") String curCode) { + relCodeBatchService.deleteDetail(curCode); + return ResultVOUtils.success("删除成功"); + } + + + @PostMapping("/udiwms/relCode/batch/deleteAllDetail") + public BaseResponse deleteAllDetail(@RequestBody List detailList) { + relCodeBatchService.deleteAllDetail(detailList); + return ResultVOUtils.success("清空成功"); + } + } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 25e28ecc9..5943670d9 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -6,6 +6,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.XmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.collect.RelCodeDetail; @@ -36,6 +37,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service @Slf4j @@ -200,4 +202,24 @@ public class RelCodeBatchService extends ServiceImpl list = relCodeDetailService.list(new LambdaQueryWrapper().eq(RelCodeDetail::getParentCode, curCode)); + if (CollUtil.isNotEmpty(list)){ + List batchIds = list.stream().map(RelCodeDetail::getBatchIdFk).collect(Collectors.toList()); + this.removeBatchByIds(batchIds); + relCodeDetailService.remove(new LambdaQueryWrapper().in(RelCodeDetail::getBatchIdFk,batchIds)); + } + } + + @Transactional(rollbackFor = Exception.class) + public void deleteAllDetail(List detailList) { + if (CollUtil.isNotEmpty(detailList)){ + detailList.forEach( item -> { + String curCode = item.getCurCode(); + this.deleteDetail(curCode); + }); + } + } }