From b65b6ff37233d752eaca4bccad76a0dd769bc28d Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Mon, 8 Jul 2024 16:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=84=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leger/controller/EquipmentLedgerController.java | 7 ++----- .../leger/controller/InventoryDocumentController.java | 2 +- .../modules/leger/controller/TechParametersController.java | 2 +- .../modules/leger/mapper/InventoryDocumentMapper.java | 2 +- .../modules/leger/mapper/InventoryDocumentMapper.xml | 2 +- .../energy/modules/leger/mapper/TechParametersMapper.java | 2 +- .../energy/modules/leger/mapper/TechParametersMapper.xml | 2 +- .../modules/leger/service/IInventoryDocumentService.java | 2 +- .../modules/leger/service/ITechParametersService.java | 2 +- .../leger/service/impl/InventoryDocumentServiceImpl.java | 2 +- .../leger/service/impl/TechParametersServiceImpl.java | 2 +- 11 files changed, 12 insertions(+), 15 deletions(-) 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 d61de26..db72d87 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -127,11 +127,8 @@ public class EquipmentLedgerController extends DafController { @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()); + inventoryDocumentService.delInventoryDocument(Integer.parseInt(id)); + techParametersService.delTechParameters(Integer.parseInt(id)); } 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 54a3802..f44ebe0 100644 --- a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java +++ b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java @@ -142,7 +142,7 @@ public class InventoryDocumentController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam String eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer 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 84ced6d..6e9fba3 100644 --- a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java +++ b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java @@ -142,7 +142,7 @@ public class TechParametersController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam String eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer 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 495da6e..19c5e5b 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java @@ -29,5 +29,5 @@ public interface InventoryDocumentMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delInventoryDocument(String eqLedgerId); + boolean delInventoryDocument(Integer 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 e1608ca..8afc78a 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml @@ -29,7 +29,7 @@ - update l_inventory_document set is_deleted = 1 where eqLedgerId = #{_parameter} + update l_inventory_document set is_deleted = 1 where eq_ledger_id = #{_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 6f2e880..a792c80 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java @@ -29,6 +29,6 @@ public interface TechParametersMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delTechParameters(String eqLedgerId); + boolean delTechParameters(Integer 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 bbd1824..e3daed2 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml @@ -23,7 +23,7 @@ - update l_tech_parameters set is_deleted = 1 where eqLedgerId = #{_parameter} + update l_tech_parameters set is_deleted = 1 where eq_ledger_id = #{_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 f18e90b..08478cd 100644 --- a/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java +++ b/src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java @@ -28,6 +28,6 @@ public interface IInventoryDocumentService extends BaseService { * @param eqLedgerId * @return */ - boolean delTechParameters(String eqLedgerId); + boolean delTechParameters(Integer 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 3d62918..8328d51 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 @@ -23,7 +23,7 @@ public class InventoryDocumentServiceImpl extends BaseServiceImpl