删除处理修正

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();
+			inventoryDocumentService.delInventoryDocument(Integer.parseInt(id));
-			equipmentLedger.setId(Integer.parseInt(id));
+			techParametersService.delTechParameters(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)));
 	}

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));
 	}
 }

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));
 	}
 }

src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.java

@@ -29,5 +29,5 @@ public interface InventoryDocumentMapper extends BaseMapper<InventoryDocument> {
 	 * @param eqLedgerId
 	 * @return
 	 */
-	boolean delInventoryDocument(String eqLedgerId);
+	boolean delInventoryDocument(Integer eqLedgerId);
 }

src/main/java/org/energy/modules/leger/mapper/InventoryDocumentMapper.xml

@@ -29,7 +29,7 @@
     </select>
 
     <update id="delInventoryDocument" >
-        update l_inventory_document set is_deleted = 1 where eqLedgerId = #{_parameter}
+        update l_inventory_document set is_deleted = 1 where eq_ledger_id = #{_parameter}
     </update>
 
 </mapper>

src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java

@@ -29,6 +29,6 @@ public interface TechParametersMapper extends BaseMapper<TechParameters> {
 	 * @param eqLedgerId
 	 * @return
 	 */
-	boolean delTechParameters(String eqLedgerId);
+	boolean delTechParameters(Integer eqLedgerId);
 
 }

src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.xml

@@ -23,7 +23,7 @@
     </select>
 
     <update id="delTechParameters" >
-        update l_tech_parameters set is_deleted = 1 where eqLedgerId = #{_parameter}
+        update l_tech_parameters set is_deleted = 1 where eq_ledger_id = #{_parameter}
     </update>
 
 </mapper>

src/main/java/org/energy/modules/leger/service/IInventoryDocumentService.java

@@ -28,6 +28,6 @@ public interface IInventoryDocumentService extends BaseService<InventoryDocument
 	 * @param eqLedgerId
 	 * @return
 	 */
-	boolean delInventoryDocument(String eqLedgerId);
+	boolean delInventoryDocument(Integer eqLedgerId);
 
 }

src/main/java/org/energy/modules/leger/service/ITechParametersService.java

@@ -28,6 +28,6 @@ public interface ITechParametersService extends BaseService<TechParameters> {
 	 * @param eqLedgerId
 	 * @return
 	 */
-	boolean delTechParameters(String eqLedgerId);
+	boolean delTechParameters(Integer eqLedgerId);
 
 }

src/main/java/org/energy/modules/leger/service/impl/InventoryDocumentServiceImpl.java

@@ -23,7 +23,7 @@ public class InventoryDocumentServiceImpl extends BaseServiceImpl<InventoryDocum
 	}
 
 	@Override
-	public boolean delInventoryDocument(String eqLedgerId) {
+	public boolean delInventoryDocument(Integer eqLedgerId) {
 		return baseMapper.delInventoryDocument(eqLedgerId);
 	}
 }

src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java

@@ -23,7 +23,7 @@ public class TechParametersServiceImpl extends BaseServiceImpl<TechParametersMap
 	}
 
 	@Override
-	public boolean delTechParameters(String eqLedgerId) {
+	public boolean delTechParameters(Integer eqLedgerId) {
 		return baseMapper.delTechParameters(eqLedgerId);
 	}
 }