From 5721ba62af0c6b171f55093e9e9e0982ff44476d Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 29 May 2023 18:01:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9pda=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basic/controller/BasicPdaController.java | 9 +++++++-- .../com/logpm/basic/service/IBasicPdarecordsService.java | 7 ++++++- .../basic/service/impl/BasicDelineMiddleServiceImpl.java | 1 + .../basic/service/impl/BasicPdarecordsServiceImpl.java | 8 ++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java index 0f1bf53fc..97973df17 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java @@ -19,7 +19,9 @@ package com.logpm.basic.controller; import com.logpm.basic.entity.BasicPdaEntity; import com.logpm.basic.excel.BasicPdaExcel; +import com.logpm.basic.feign.IBasicPdarecordsClient; import com.logpm.basic.service.IBasicPdaService; +import com.logpm.basic.service.IBasicPdarecordsService; import com.logpm.basic.vo.BasicPdaVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -62,7 +64,7 @@ public class BasicPdaController extends BladeController { private final IBasicPdaService basicPdaService; - private final IDictBizClient iDictBizClient; + private final IBasicPdarecordsService basicPdarecordsService; /** * pda信息 详情 @@ -138,7 +140,10 @@ public class BasicPdaController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(basicPdaService.deleteLogic(Func.toLongList(ids))); + List longs = Func.toLongList(ids); + //删除维修记录 + basicPdarecordsService.deleteByMasterId(longs); + return R.status(basicPdaService.deleteLogic(longs)); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPdarecordsService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPdarecordsService.java index c3bcb0fbf..ad679da6c 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPdarecordsService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPdarecordsService.java @@ -49,5 +49,10 @@ public interface IBasicPdarecordsService extends BaseService exportBasicPdarecords(Wrapper queryWrapper); - + /** + * 删除维修记录 + * + * @return + */ + Integer deleteByMasterId(List longs); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java index be5bbf535..8fa9f772d 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java @@ -64,6 +64,7 @@ public class BasicDelineMiddleServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + //子表新增 basicDeline.getDelinenode().forEach(e->{ BasicDelineMiddleEntity basicDelineMiddleEntity = new BasicDelineMiddleEntity(); basicDelineMiddleEntity.setDelineId(basicDeline.getId()); diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPdarecordsServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPdarecordsServiceImpl.java index 63adf0282..86607017c 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPdarecordsServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPdarecordsServiceImpl.java @@ -16,7 +16,9 @@ */ package com.logpm.basic.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.basic.dto.BasicPdarecordsDTO; +import com.logpm.basic.entity.BasicLineNodeEntity; import com.logpm.basic.entity.BasicPdarecordsEntity; import com.logpm.basic.vo.BasicPdarecordsVO; import com.logpm.basic.excel.BasicPdarecordsExcel; @@ -52,4 +54,10 @@ public class BasicPdarecordsServiceImpl extends BaseServiceImpl longs) { + QueryWrapper wrapper = new QueryWrapper(); + return baseMapper.delete(wrapper.lambda().in(BasicPdarecordsEntity::getMasterId,longs)); + } + }