From 0a254d39a417f21468430a8a3f8e639a02923bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Thu, 16 Sep 2021 10:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=20=E5=87=BA=E5=85=A5=E5=BA=93=E4=BB=BB=E5=8A=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/recordtask/recordtask.html  | 7 +++++++
 .../src/main/resources/mapper/system/RecordTaskMapper.xml  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
index a029975..01a6768 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html
@@ -18,6 +18,13 @@
                                 <label>箱体编码：</label>
                                 <input type="text" name="boxCode"/>
                             </li>
+                            <li>
+                                <label>任务状态：</label>
+                                <select name="taskStatus" th:with="type=${@dict.getType('location_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordTaskMapper.xml
index 4fe1204..ecacaba 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordTaskMapper.xml
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="taskCode != null  and taskCode != ''"> and task_code like concat(concat('%', #{taskCode}), '%')</if>
             <if test="boxCode != null  and boxCode != ''"> and box_code like concat(concat('%', #{boxCode}), '%')</if>
+            <if test="taskStatus != null"> and task_status like concat(concat('%', #{taskStatus}), '%')</if>
         </where>
     </select>