From 84abfa3770824ddab2326977510796055ac927f0 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 16 May 2023 13:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BAObject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialTypeController.java | 10 +++++----- .../depository_manage/mapper/MaterialTypeMapper.java | 10 +++++----- .../depository_manage/mapper/MaterialTypeMapper.xml | 4 ++-- .../depository_manage/service/MaterialTypeService.java | 10 +++++----- .../service/impl/MaterialServiceImpl.java | 5 ++--- .../service/impl/MaterialTypeServiceImpl.java | 10 +++++----- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java index 4852295b..0330eeae 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java @@ -99,8 +99,8 @@ public class MaterialTypeController { return CrudUtil.deleteHandle(integer,1); }else if (map.containsKey("ids")){ - List ids=(List) map.get("ids"); - for (Integer id : ids) { + List ids=(List) map.get("ids"); + for (Object id : ids) { MaterialType materialTypeById = materialTypeService.findMaterialTypeById(id); HandlesOtherFunctionalThreadPool.execute(() -> RealDeleteSonDepository(materialTypeById.getOldId().toString())); } @@ -147,7 +147,7 @@ public class MaterialTypeController { @PostMapping("/materialType_del") public RestResponse deleteMaterialType(@RequestBody Map map){ if (map.containsKey("id")){ - Integer id= ObjectFormatUtil.toInteger(map.get("id")); + Object id = map.get("id"); MaterialType materialTypeById = materialTypeService.findMaterialTypeById(id); HandlesOtherFunctionalThreadPool.execute(() -> UpdateSonState(materialTypeById.getOldId().toString(),3)); @@ -165,8 +165,8 @@ public class MaterialTypeController { return CrudUtil.deleteHandle(integer,1); }else if (map.containsKey("ids")){ - List ids=(List) map.get("ids"); - for (Integer id : ids) { + List ids=(List) map.get("ids"); + for (Object id : ids) { MaterialType materialTypeById = materialTypeService.findMaterialTypeById(id); HandlesOtherFunctionalThreadPool.execute(() -> UpdateSonState(materialTypeById.getOldId().toString(), 3)); } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java index 6f62df26..99761109 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java @@ -33,7 +33,7 @@ public interface MaterialTypeMapper { * @param id 物料类型id * @return 物料类型对象 */ - MaterialType findMaterialTypeById(Integer id); + MaterialType findMaterialTypeById(Object id); /** * 根据类型名称查询物料类型 @@ -92,14 +92,14 @@ public interface MaterialTypeMapper { * @param id 待删除id * @return 受影响的条数 */ - Integer deleteMaterialTypeById(Integer id); + Integer deleteMaterialTypeById(Object id); /** * 根据多个id删除物料类型 * @param ids 待删除所有id * @return 受影响条数 */ - Integer deleteMaterialTypeByIds(List ids); + Integer deleteMaterialTypeByIds(List ids); /** * 批量修改数据 @@ -113,14 +113,14 @@ public interface MaterialTypeMapper { * @param id * @return 受影响条数 */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Object id); /** * 根据多个主键id将物料类型状态修改为删除 * @param ids * @return 受影响条数 */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml index 0381fcb1..19d19346 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml @@ -117,7 +117,7 @@ - SELECT FROM material_type mt WHERE mt.oldId = #{id} and mt.state != 3 and mt.state != 4 @@ -217,7 +217,7 @@ - + DELETE FROM material_type WHERE oldId = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java index ab7b9c06..aa86b23e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java @@ -47,14 +47,14 @@ public interface MaterialTypeService { * @param id * @return 受影响数目 */ - Integer deleteMaterialTypeById(Integer id); + Integer deleteMaterialTypeById(Object id); /** * 根据多个主键id删除记录 * @param ids * @return 受影响数目 */ - Integer deleteMaterialTypeByIds(List ids); + Integer deleteMaterialTypeByIds(List ids); /** * 修改物料类型 @@ -68,7 +68,7 @@ public interface MaterialTypeService { * @param id * @return 对应记录 */ - MaterialType findMaterialTypeById(Integer id); + MaterialType findMaterialTypeById(Object id); /** * 根据类型名称查询物料类型 @@ -88,14 +88,14 @@ public interface MaterialTypeService { * @param id * @return 受影响条数 */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Object id); /** * 根据多个主键ids将物料类型状态修改为删除 * @param ids * @return 受影响条数 */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 根据条件修改状态 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 78dc3004..f36a184c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -112,15 +112,14 @@ public class MaterialServiceImpl implements MaterialService { Object code = map.get("code"); if (code == null) { if (map.containsKey("typeId")) { - Integer typeId = ObjectFormatUtil.toInteger(map.get("typeId").toString()); - MaterialType materialTypeById = materialTypeMapper.findMaterialTypeById(typeId); + MaterialType materialTypeById = materialTypeMapper.findMaterialTypeById(map.get("typeId")); map.put("materialTypeId", materialTypeById.getOldId()); String maxCode = materialMapper.findMaxMaterialCodeForMt(materialTypeById.getOldId()); String newCode = ""; if (maxCode == null) { newCode = String.format("%04d", 1); } else { - newCode = String.format("%04d", Integer.parseInt(maxCode) + 1); + newCode = String.format("%04d", Long.parseLong(maxCode) + 1); } map.put("code", newCode); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java index 2e2d94d3..98cd79ae 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java @@ -120,7 +120,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { * @return 受影响数目 */ @Override - public Integer deleteMaterialTypeById(Integer id) { + public Integer deleteMaterialTypeById(Object id) { return materialTypeMapper.deleteMaterialTypeById(id); } @@ -130,7 +130,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { * @return 受影响数目 */ @Override - public Integer deleteMaterialTypeByIds(List ids) { + public Integer deleteMaterialTypeByIds(List ids) { return materialTypeMapper.deleteMaterialTypeByIds(ids); } @@ -156,7 +156,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { * @return 对应记录 */ @Override - public MaterialType findMaterialTypeById(Integer id) { + public MaterialType findMaterialTypeById(Object id) { return materialTypeMapper.findMaterialTypeById(id); } @@ -181,7 +181,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { * @return 受影响条数 */ @Override - public Integer changeStateToDeletedById(Integer id) { + public Integer changeStateToDeletedById(Object id) { return materialTypeMapper.changeStateToDeletedById(id); } @@ -191,7 +191,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { * @return 受影响条数 */ @Override - public Integer changeStateToDeletedByIds(List ids) { + public Integer changeStateToDeletedByIds(List ids) { return materialTypeMapper.changeStateToDeletedByIds(ids); }