From 18154c69d44e908c2ccddff0356de2703d7ec10f Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Mon, 8 Jul 2024 15:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=A9=B3=E5=9B=9E=20?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leger/controller/EquipmentLedgerController.java | 11 +++++++++++ .../leger/controller/InventoryDocumentController.java | 10 ++++++++++ .../leger/controller/TechParametersController.java | 9 +++++++++ .../modules/leger/mapper/InventoryDocumentMapper.java | 7 +++++++ .../modules/leger/mapper/InventoryDocumentMapper.xml | 4 ++++ .../modules/leger/mapper/TechParametersMapper.java | 8 ++++++++ .../modules/leger/mapper/TechParametersMapper.xml | 4 ++++ .../leger/service/IInventoryDocumentService.java | 8 ++++++++ .../modules/leger/service/ITechParametersService.java | 8 ++++++++ .../service/impl/InventoryDocumentServiceImpl.java | 4 ++++ .../leger/service/impl/TechParametersServiceImpl.java | 4 ++++ 11 files changed, 77 insertions(+) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 364dae5..d61de26 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -26,6 +26,8 @@ import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; +import org.energy.modules.leger.service.IInventoryDocumentService; +import org.energy.modules.leger.service.ITechParametersService; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -50,6 +52,8 @@ import java.util.List; public class EquipmentLedgerController extends DafController { private IEquipmentLedgerService equipmentLedgerService; + private IInventoryDocumentService inventoryDocumentService; + private ITechParametersService techParametersService; /** * 详情 @@ -122,6 +126,13 @@ public class EquipmentLedgerController extends DafController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + for (String id : ids.split(",")) { + EquipmentLedger equipmentLedger = new EquipmentLedger(); + equipmentLedger.setId(Integer.parseInt(id)); + EquipmentLedger detail = equipmentLedgerService.getOne(Condition.getQueryWrapper(equipmentLedger)); + inventoryDocumentService.delInventoryDocument(detail.getEqLedgerCode()); + techParametersService.delTechParameters(detail.getEqLedgerCode()); + } return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids))); } diff --git a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java index ce5f9a9..54a3802 100644 --- a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java +++ b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java @@ -135,4 +135,14 @@ public class InventoryDocumentController extends DafController { List list = inventoryDocumentService.list(Condition.getQueryWrapper(inventoryDocument)); return R.data(list); } + + /** + * 删除 技术参数一览 + */ + @GetMapping("/del") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam String eqLedgerId) { + return R.status(inventoryDocumentService.delInventoryDocument(eqLedgerId)); + } } diff --git a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java index 2bdfbe1..84ced6d 100644 --- a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java +++ b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java @@ -136,4 +136,13 @@ public class TechParametersController extends DafController { return R.data(list); } + /** + * 删除 技术参数一览 + */ + @GetMapping("/del") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam String eqLedgerId) { + return R.status(techParametersService.delTechParameters(eqLedgerId)); + } } diff --git a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java index b7026a6..495da6e 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java @@ -23,4 +23,11 @@ public interface InventoryDocumentMapper extends BaseMapper { */ List selectInventoryDocumentPage(IPage page, InventoryDocumentVO inventoryDocument); + /** + * 自定义分页 + * + * @param eqLedgerId + * @return + */ + boolean delInventoryDocument(String eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml index ce946f0..e1608ca 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml @@ -28,4 +28,8 @@ select * from l_inventory_document where is_deleted = 0 + + update l_inventory_document set is_deleted = 1 where eqLedgerId = #{_parameter} + + diff --git a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java index 7f61771..6f2e880 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java @@ -23,4 +23,12 @@ public interface TechParametersMapper extends BaseMapper { */ List selectTechParametersPage(IPage page, TechParametersVO techParameters); + /** + * 自定义分页 + * + * @param eqLedgerId + * @return + */ + boolean delTechParameters(String eqLedgerId); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml index 98c7150..bbd1824 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml @@ -22,4 +22,8 @@ select * from l_tech_parameters where is_deleted = 0 + + update l_tech_parameters set is_deleted = 1 where eqLedgerId = #{_parameter} + + diff --git a/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java b/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java index 84e1eb7..f18e90b 100644 --- a/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java +++ b/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java @@ -22,4 +22,12 @@ public interface IInventoryDocumentService extends BaseService selectInventoryDocumentPage(IPage page, InventoryDocumentVO inventoryDocument); + /** + * 自定义分页 + * + * @param eqLedgerId + * @return + */ + boolean delInventoryDocument(String eqLedgerId); + } diff --git a/src/main/java/org/energy/modules/leger/service/ITechParametersService.java b/src/main/java/org/energy/modules/leger/service/ITechParametersService.java index 5c40826..60b1852 100644 --- a/src/main/java/org/energy/modules/leger/service/ITechParametersService.java +++ b/src/main/java/org/energy/modules/leger/service/ITechParametersService.java @@ -22,4 +22,12 @@ public interface ITechParametersService extends BaseService { */ IPage selectTechParametersPage(IPage page, TechParametersVO techParameters); + /** + * 自定义分页 + * + * @param eqLedgerId + * @return + */ + boolean delTechParameters(String eqLedgerId); + } diff --git a/src/main/java/org/energy/modules/leger/service/impl/InventoryDocumentServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/InventoryDocumentServiceImpl.java index 6c830f0..3d62918 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/InventoryDocumentServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/InventoryDocumentServiceImpl.java @@ -22,4 +22,8 @@ public class InventoryDocumentServiceImpl extends BaseServiceImpl