From 1d10e98ecf951dcb5d8fbd29b4c2efd745879169 Mon Sep 17 00:00:00 2001
From: youjianchi <13260889671@163.com>
Date: Wed, 14 Feb 2024 20:53:52 +0800
Subject: [PATCH] =?UTF-8?q?[update]:=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/erp/domain/ErpMaterialVo.java   | 14 ++++++
 .../controller/system/SysUserController.java  |  9 ++++
 .../templates/demo/table/fixedColumns.html    |  1 +
 .../templates/erp/material/material.html      | 47 +++++++++++++++++--
 .../core/controller/BaseController.java       |  8 ++++
 .../ruoyi/system/mapper/SysUserMapper.java    |  5 ++
 .../ruoyi/system/service/ISysUserService.java |  3 ++
 .../service/impl/SysUserServiceImpl.java      |  6 +++
 .../resources/mapper/system/SysUserMapper.xml | 10 +++-
 9 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java
index bb3a0650..c852d879 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java
@@ -88,4 +88,18 @@ public class ErpMaterialVo extends ErpMaterial {
     public void setInstanceTypeName(String instanceTypeName) {
         this.instanceTypeName = instanceTypeName;
     }
+
+    @Override
+    public String toString() {
+        return "ErpMaterialVo{" +
+                "applyUserName='" + applyUserName + '\'' +
+                ", taskId='" + taskId + '\'' +
+                ", taskName='" + taskName + '\'' +
+                ", doneTime=" + doneTime +
+                ", createUserName='" + createUserName + '\'' +
+                ", suspendState='" + suspendState + '\'' +
+                ", todoUserId='" + todoUserId + '\'' +
+                ", instanceTypeName='" + instanceTypeName + '\'' +
+                '}';
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 66a108b5..663b872b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -292,4 +293,12 @@ public class SysUserController extends BaseController
         //System.out.println(allUser);
         return Result.getSuccessResult(allUser);
     }
+
+    @GetMapping("/selectUserSelList")
+    @ResponseBody
+    public AjaxResult selectUserSelList(@RequestParam(required = false,value = "userName")String userName)
+    {
+        List<Map<String, String>> userSelList = userService.selectUserSelList(userName);
+        return success(userSelList);
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
index a81e4414..4e634606 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
@@ -23,6 +23,7 @@
 	</div>
 </div>
 <div th:include="include :: footer"></div>
+<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 <script th:inline="javascript">
 	var prefix = ctx + "demo/table";
 	var datas = [[${@dict.getType('sys_normal_disable')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 2ff25b3c..bbee3462 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('物料信息列表')" />
+    <th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -12,7 +13,7 @@
                         <ul>
                             <li>
                                 <label>料号：</label>
-                                <input type="text" name="materialNo"/>
+                                <input type="text" name="params[materialNo]"/>
                             </li>
                             <li>
                                 <label>物料名称：</label>
@@ -34,18 +35,20 @@
                             </li>
                             <li>
                                 <label>工程员：</label>
-                                <input type="text" name="createBy"/>
+                                <select id="createBySel" name="createBy">
+
+                                </select>
                             </li>
                             <li>
                                 <label>是否有生产团队：</label>
-                                <select name="createBy" th:with="type=${@dict.getType('havaProductTem')}">
+                                <select name="havaProductTem" th:with="type=${@dict.getType('havaProductTem')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>物料类型：</label>
-                                <select id="selectMaterialType" th:with="childList=${@category.getChildByCode('materialType')}">
+                                <select name="materialType" id="selectMaterialType" th:with="childList=${@category.getChildByCode('materialType')}">
                                     <optgroup th:each="child: ${childList}" th:label="${child.name}">
                                         <option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
                                     </optgroup>
@@ -425,6 +428,42 @@
         var productItems = [];
         var prefix = ctx + "erp/material";
         $(function() {
+            $('#createBySel').select2({
+                placeholder: "请选择工程员",
+                allowClear: true, // 允许清除
+                minimumInputLength: 1, // 触发搜索的最小字符数
+                ajax: {
+                    url: ctx + "system/user/selectUserSelList", // 你的搜索接口 URL
+                    dataType: 'json',
+                    delay: 250, // 查询延迟
+                    data: function (params) {
+                        console.log(params);
+                        return {
+                            userName: params.term, // 当前查询的关键词
+                        };
+                    },
+                    processResults: function (data, params) {
+                        console.log(data);
+                        if(data.code==0){
+                            return {
+                                results: data.data
+                            };
+                        }
+                        return {
+                            results: []
+                        };
+                    },
+                    cache: true // 启用缓存
+                },
+                /*escapeMarkup: function (markup) { return markup; }, // 让 Select2 正确处理 HTML 内容
+                templateResult: function (data) {
+                    return data.text; // 自定义显示的内容
+                },
+                templateSelection: function (data) {
+                    return data.text; // 自定义选择后显示的内容
+                }*/
+            });
+
             var options = {
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index aa501e35..3ab60d77 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -185,6 +185,14 @@ public class BaseController
         return AjaxResult.success(message);
     }
 
+    /**
+     * 返回成功数据
+     */
+    public static AjaxResult success(Object data)
+    {
+        return AjaxResult.success("操作成功", data);
+    }
+
     /**
      * 返回失败消息
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index ee8891d6..1d88bd23 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -1,8 +1,10 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.MapKey;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户表 数据层
@@ -124,4 +126,7 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     public List<SysUser> selectAllUser();
+
+    @MapKey("id")
+    List<Map<String,String>> selectUserSelList(String userName);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index c7145d49..bc0eb107 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysUserRole;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层
@@ -207,4 +208,6 @@ public interface ISysUserService
     public int changeStatus(SysUser user);
 
     public List<SysUser> getAllUser()throws Exception;
+
+    List<Map<String,String>> selectUserSelList(String userName);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e1eccbe0..786d7139 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层处理
@@ -525,4 +526,9 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> getAllUser() throws Exception {
         return userMapper.selectAllUser();
     }
+
+    @Override
+    public List<Map<String, String>> selectUserSelList(String userName) {
+        return userMapper.selectUserSelList(userName);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7769a6d7..52bf817a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -227,5 +227,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectAllUser" resultType="SysUser" resultMap="SysUserResult">
 		select sys_user.user_name from sys_user
 	</select>
-	
+    <select id="selectUserSelList" resultType="java.util.Map">
+		select
+			login_name as id
+			 ,user_name as text
+		from sys_user
+		where del_flag = '0'
+	  	and user_name like concat('%', #{userName}, '%')
+	</select>
+
 </mapper> 
\ No newline at end of file