Memory_LG 5 месяцев назад
Родитель
Сommit
a557d5d440

+ 13 - 32
qmjszx-admin/src/main/resources/templates/admissionticket/admissionTicket.html

@@ -15,6 +15,18 @@
                                 <input type="text" class="time-input" placeholder="请选择门票日期" name="ticketDate" th:value="${ticketDate}"/>
                             </li>
                             <li>
+                                <label>场地名称:</label>
+                                <input type="text" name="siteName" th:value="${siteName}" data-template="请输入场地名称"/>
+                            </li>
+                            <li>
+                                <label>场地类型:</label>
+                                <select name="siteType" th:with="type=${@dict.getType('site_type')}">
+                                    <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>
                             </li>
@@ -22,21 +34,6 @@
                     </div>
                 </form>
             </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="admissionticket:AdmissionTicket:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="admissionticket:AdmissionTicket:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="admissionticket:AdmissionTicket:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="admissionticket:AdmissionTicket:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -61,11 +58,6 @@
                     checkbox: true
                 },
                 {
-                    field: 'id',
-                    title: '唯一标识',
-                    visible: false
-                },
-                {
                     field: 'venueId',
                     title: '场馆id'
                 },
@@ -98,18 +90,7 @@
                     formatter: function (value, row, index) {
                         return statusTools(row);
                     }
-                },
-                /*{
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }*/
-                ]
+                }]
             };
             $.table.init(options);
         });

+ 2 - 0
qmjszx-business/src/main/resources/mapper/admissionticket/AdmissionTicketMapper.xml

@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBeilvAdmissionTicketList" parameterType="AdmissionTicket" resultMap="AdmissionTicketResult">
         <include refid="selectBeilvAdmissionTicketVo"/>
         <where>
+            <if test="siteName != null and siteName != ''"> and site_name = #{siteName}</if>
+            <if test="siteType != null and siteType != ''"> and site_type = #{siteType}</if>
             <if test="ticketDate != null "> and ticket_date = #{ticketDate}</if>
             <if test="admissionTicketStatus != null  and admissionTicketStatus != ''"> and admission_ticket_status = #{admissionTicketStatus}</if>
         </where>