diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java b/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java index d82ec0a..c5fa92e 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java +++ b/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java @@ -78,14 +78,13 @@ public class MaterialController { return result; } - @GetMapping("material/list") + @PostMapping("material/list") @Operation(summary = "查询所有物料列表") public List all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type) { - List all = materialService.list(Wrappers.lambdaQuery() - .likeRight(StringUtils.isNotBlank(type), Material::getType, type)); - - all.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); - return all; + String[] types = StringUtils.isNotBlank(type) ? type.split(",") : new String[0]; + List materials = materialService.queryLikeRight(List.of(types)); + materials.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + return materials; } @GetMapping("material/{id}") diff --git a/src/main/java/tech/riemann/ims/mapper/material/MaterialMapper.java b/src/main/java/tech/riemann/ims/mapper/material/MaterialMapper.java index 4b21ee9..56a76b6 100644 --- a/src/main/java/tech/riemann/ims/mapper/material/MaterialMapper.java +++ b/src/main/java/tech/riemann/ims/mapper/material/MaterialMapper.java @@ -1,11 +1,15 @@ package tech.riemann.ims.mapper.material; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import tech.riemann.ims.entity.material.Material; +import java.util.List; + /** * @author mayong * @since 2024/11/27 15:42 */ public interface MaterialMapper extends BaseMapper { + List queryLikeRight( @Param("types") List types); } diff --git a/src/main/java/tech/riemann/ims/service/material/IMaterialService.java b/src/main/java/tech/riemann/ims/service/material/IMaterialService.java index 62d5d8f..0b1be89 100644 --- a/src/main/java/tech/riemann/ims/service/material/IMaterialService.java +++ b/src/main/java/tech/riemann/ims/service/material/IMaterialService.java @@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.nutz.spring.boot.service.interfaces.IdNameEntityService; import tech.riemann.ims.entity.material.Material; +import java.util.List; + /** * @author mayong * @since 2024/11/27 15:40 */ public interface IMaterialService extends IService, IdNameEntityService { + + List queryLikeRight(List types); } diff --git a/src/main/java/tech/riemann/ims/service/material/impl/MaterialServiceImpl.java b/src/main/java/tech/riemann/ims/service/material/impl/MaterialServiceImpl.java index 47abc5e..7514967 100644 --- a/src/main/java/tech/riemann/ims/service/material/impl/MaterialServiceImpl.java +++ b/src/main/java/tech/riemann/ims/service/material/impl/MaterialServiceImpl.java @@ -8,6 +8,8 @@ import tech.riemann.ims.entity.material.Material; import tech.riemann.ims.mapper.material.MaterialMapper; import tech.riemann.ims.service.material.IMaterialService; +import java.util.List; + /** * @author mayong * @since 2024/11/27 15:41 @@ -21,4 +23,9 @@ public class MaterialServiceImpl extends ServiceImpl i public Dao dao() { return dao; } + + @Override + public List queryLikeRight(List types) { + return baseMapper.queryLikeRight(types); + } } diff --git a/src/main/resources/mapper/MaterialMapper.xml b/src/main/resources/mapper/MaterialMapper.xml new file mode 100644 index 0000000..d25c277 --- /dev/null +++ b/src/main/resources/mapper/MaterialMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + \ No newline at end of file