From 18f67ef62ab6f00d5e9a30aa288484b5a0e56a15 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sat, 8 Mar 2025 20:21:18 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/material/MaterialController.java | 11 +++---
 .../ims/mapper/material/MaterialMapper.java   |  4 +++
 .../service/material/IMaterialService.java    |  4 +++
 .../material/impl/MaterialServiceImpl.java    |  7 ++++
 src/main/resources/mapper/MaterialMapper.xml  | 34 +++++++++++++++++++
 5 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/mapper/MaterialMapper.xml

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<Material> all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type) {
-        List<Material> all = materialService.list(Wrappers.<Material>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<Material> 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<Material> {
+    List<Material> queryLikeRight( @Param("types") List<String> 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<Material>, IdNameEntityService<Material> {
+
+    List<Material> queryLikeRight(List<String> 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<MaterialMapper, Material> i
     public Dao dao() {
         return dao;
     }
+
+    @Override
+    public List<Material> queryLikeRight(List<String> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="tech.riemann.ims.mapper.material.MaterialMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="tech.riemann.ims.entity.material.Material">
+
+    </resultMap>
+    <select id="queryLikeRight" resultType="tech.riemann.ims.entity.material.Material">
+        SELECT
+        id,
+        m_code AS `code`,
+        m_name AS `name`,
+        m_assign_rule AS `assignRule`,
+        m_type AS `type`,
+        m_price AS `price`,
+        m_spec AS `spec`,
+        m_stock AS `stock`,
+        m_description AS `description`,
+        created_time,
+        updated_time,
+        created_by,
+        updated_by
+        FROM
+        t_material
+        <where>
+            <foreach collection="types" item="item" separator="or">
+                ( m_type like concat(#{item},'%') )
+            </foreach>
+        </where>
+
+    </select>
+
+</mapper>
\ No newline at end of file