diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialtype/MaterialTypeController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialtype/MaterialTypeController.java index e7503d5..ce919b9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialtype/MaterialTypeController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialtype/MaterialTypeController.java @@ -80,7 +80,7 @@ public class MaterialTypeController { return success(BeanUtils.toBean(materialType, MaterialTypeRespVO.class)); } - @GetMapping("/listForPage") + @GetMapping("/page") @Operation(summary = "获得物料类型分页") @PreAuthorize("@ss.hasPermission('garden:material-type:query')") public CommonResult> getMaterialTypePage(@Valid MaterialTypePageReqVO pageReqVO) { diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/materialtype/MaterialTypeDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/materialtype/MaterialTypeDO.java index fe3ae95..cc02120 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/materialtype/MaterialTypeDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/materialtype/MaterialTypeDO.java @@ -63,18 +63,6 @@ public class MaterialTypeDO extends BaseDO { * 备注 */ private String remark; - /** - * 状态(0正常 1停用) - */ - private String status; - /** - * 创建者 - */ - private String creator; - /** - * 更新者 - */ - private String updater; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java index 4794b2e..6fbb38c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java @@ -116,10 +116,10 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ } @Override - public void deleteMaterialInventoryOutListByIds(List ids) { + public void deleteMaterialInventoryOutListByIds(List ids) { // 删除 materialInventoryOutMapper.deleteByIds(ids); - } + } private void validateMaterialInventoryOutExists(Long id) { diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialtype/MaterialTypeServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialtype/MaterialTypeServiceImpl.java index db76698..8fa2acd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialtype/MaterialTypeServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialtype/MaterialTypeServiceImpl.java @@ -54,7 +54,6 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { MaterialTypeDO materialType = BeanUtils.toBean(createReqVO, MaterialTypeDO.class); materialType.setParentTypeId(createReqVO.getTypeId()); materialType.setMaterialParentTypeId(createReqVO.getMaterialTypeId()); - materialType.setStatus("0"); materialType.setCreator(String.valueOf(getLoginUserDeptId())); materialType.setUpdater(materialType.getCreator()); materialTypeMapper.insert(materialType);