瀏覽代碼

场馆 球场 时段

lchao 5 月之前
父節點
當前提交
b11aaa5123
共有 21 個文件被更改,包括 424 次插入297 次删除
  1. 2 2
      qmjszx-admin/src/main/resources/templates/system/mall/add.html
  2. 2 2
      qmjszx-admin/src/main/resources/templates/system/mall/edit.html
  3. 13 3
      qmjszx-admin/src/main/resources/templates/system/session/add.html
  4. 13 3
      qmjszx-admin/src/main/resources/templates/system/session/edit.html
  5. 5 5
      qmjszx-admin/src/main/resources/templates/system/session/session.html
  6. 18 10
      qmjszx-admin/src/main/resources/templates/system/site/add.html
  7. 16 10
      qmjszx-admin/src/main/resources/templates/system/site/edit.html
  8. 12 35
      qmjszx-admin/src/main/resources/templates/system/site/site.html
  9. 22 8
      qmjszx-admin/src/main/resources/templates/system/venue/add.html
  10. 141 127
      qmjszx-admin/src/main/resources/templates/system/venue/edit.html
  11. 63 73
      qmjszx-admin/src/main/resources/templates/system/venue/venue.html
  12. 8 1
      qmjszx-business/src/main/java/beilv/session/controller/BeilvSessionController.java
  13. 9 0
      qmjszx-business/src/main/java/beilv/session/domain/BeilvSession.java
  14. 16 1
      qmjszx-business/src/main/java/beilv/site/controller/BeilvSiteController.java
  15. 5 0
      qmjszx-business/src/main/java/beilv/site/domain/BeilvSite.java
  16. 5 0
      qmjszx-business/src/main/java/beilv/site/service/impl/BeilvSiteServiceImpl.java
  17. 6 0
      qmjszx-business/src/main/java/beilv/venue/domain/BeilvVenue.java
  18. 1 0
      qmjszx-business/src/main/java/beilv/venue/service/IBeilvVenueService.java
  19. 28 4
      qmjszx-business/src/main/resources/mapper/session/BeilvSessionMapper.xml
  20. 32 11
      qmjszx-business/src/main/resources/mapper/site/BeilvSiteMapper.xml
  21. 7 2
      qmjszx-business/src/main/resources/mapper/venue/BeilvVenueMapper.xml

+ 2 - 2
qmjszx-admin/src/main/resources/templates/system/mall/add.html

@@ -107,10 +107,10 @@
         focusCleanup: true,
         rules:{
             salePrice:{
-                digits:true
+                double:true
             },
             suggestionPrice:{
-                digits:true
+                double:true
             },
         },
     });

+ 2 - 2
qmjszx-admin/src/main/resources/templates/system/mall/edit.html

@@ -123,10 +123,10 @@
         focusCleanup: true,
         rules:{
             salePrice:{
-                digits:true
+                double:true
             },
             suggestionPrice:{
-                digits:true
+                double:true
             },
         },
     });

+ 13 - 3
qmjszx-admin/src/main/resources/templates/system/session/add.html

@@ -8,7 +8,7 @@
         <form class="form-horizontal m" id="form-session-add">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">分类id:</label>
+                    <label class="col-sm-3 control-label">分类:</label>
                     <div class="col-sm-8">
                         <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -18,6 +18,14 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
+                    <label class="col-sm-3 control-label">排序:</label>
+                    <div class="col-sm-8">
+                        <input name="sort" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
                     <label class="col-sm-3 control-label">时段:</label>
                     <div class="col-sm-8">
                         <input name="session" class="form-control" type="text">
@@ -34,9 +42,11 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">场馆id:</label>
+                    <label class="col-sm-3 control-label is-required">场馆名称:</label>
                     <div class="col-sm-8">
-                        <input name="venueId" class="form-control" type="text">
+                        <select name="venueId" class="form-control" >
+                            <option th:each="post:${beilvSitesList}" th:value="${post.id}" th:text="${post.venueName}" ></option>
+                        </select>
                     </div>
                 </div>
             </div>

+ 13 - 3
qmjszx-admin/src/main/resources/templates/system/session/edit.html

@@ -9,7 +9,7 @@
             <input name="id" th:field="*{id}" type="hidden">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">分类id:</label>
+                    <label class="col-sm-3 control-label">分类:</label>
                     <div class="col-sm-8">
                         <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{siteType}"></option>
@@ -19,6 +19,14 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
+                    <label class="col-sm-3 control-label">排序:</label>
+                    <div class="col-sm-8">
+                        <input name="sort" th:field="*{sort}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
                     <label class="col-sm-3 control-label">时段:</label>
                     <div class="col-sm-8">
                         <input name="session" th:field="*{session}" class="form-control" type="text">
@@ -35,9 +43,11 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">场馆id:</label>
+                    <label class="col-sm-3 control-label is-required">场馆名称:</label>
                     <div class="col-sm-8">
-                        <input name="venueId" th:field="*{venueId}" class="form-control" type="text">
+                        <select name="venueId" class="form-control" >
+                            <option th:each="post:${beilvSitesList}" th:value="${post.id}" th:text="${post.venueName}" ></option>
+                        </select>
                     </div>
                 </div>
             </div>

+ 5 - 5
qmjszx-admin/src/main/resources/templates/system/session/session.html

@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>分类id:</label>
+                                <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>
@@ -26,7 +26,7 @@
                                 <input type="text" name="price"/>
                             </li>
                             <li>
-                                <label>场馆id:</label>
+                                <label>场馆名称:</label>
                                 <input type="text" name="venueId"/>
                             </li>
                             <li>
@@ -82,7 +82,7 @@
                 },
                 {
                     field: 'siteType',
-                    title: '分类id',
+                    title: '分类',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(siteTypeDatas, value);
                     }
@@ -96,8 +96,8 @@
                     title: '价格'
                 },
                 {
-                    field: 'venueId',
-                    title: '场馆id'
+                    field: 'venueName',
+                    title: '场馆名称'
                 },
                 {
                     title: '操作',

+ 18 - 10
qmjszx-admin/src/main/resources/templates/system/site/add.html

@@ -9,15 +9,15 @@
         <form class="form-horizontal m" id="form-site-add">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">名称:</label>
+                    <label class="col-sm-3 control-label is-required">名称:</label>
                     <div class="col-sm-8">
-                        <input name="name" class="form-control" type="text">
+                        <input name="name" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">分类id:</label>
+                    <label class="col-sm-3 control-label">分类:</label>
                     <div class="col-sm-8">
                         <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -29,7 +29,10 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">封面:</label>
                     <div class="col-sm-8">
-                        <input name="cover" class="form-control" type="text">
+                        <input type="hidden" name="cover">
+                        <div class="file-loading">
+                            <input class="form-control file-upload" id="cover" name="file" type="file">
+                        </div>
                     </div>
                 </div>
             </div>
@@ -44,32 +47,36 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">价格:</label>
+                    <label class="col-sm-3 control-label is-required">价格:</label>
                     <div class="col-sm-8">
-                        <input name="price" class="form-control" type="text">
+                        <input name="price" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">温馨提示:</label>
+                    <label class="col-sm-3 control-label is-required">温馨提示:</label>
                     <div class="col-sm-8">
-                        <input name="warmReminder" class="form-control" type="text">
+                        <input name="warmReminder" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">场馆id:</label>
+                    <label class="col-sm-3 control-label is-required">场馆名称:</label>
                     <div class="col-sm-8">
-                        <input name="venueId" class="form-control" type="text">
+                        <select name="venueId" class="form-control" >
+                            <option th:each="post:${beilvSitesList}" th:value="${post.id}" th:text="${post.venueName}" ></option>
+                        </select>
                     </div>
                 </div>
             </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: summernote-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
     <script th:inline="javascript">
         var prefix = ctx + "system/site"
         $("#form-site-add").validate({
@@ -82,6 +89,7 @@
             }
         }
 
+
         $(function() {
             $('.summernote').summernote({
                 lang: 'zh-CN',

+ 16 - 10
qmjszx-admin/src/main/resources/templates/system/site/edit.html

@@ -10,15 +10,15 @@
             <input name="id" th:field="*{id}" type="hidden">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">名称:</label>
+                    <label class="col-sm-3 control-label is-required">名称:</label>
                     <div class="col-sm-8">
-                        <input name="name" th:field="*{name}" class="form-control" type="text">
+                        <input name="name" th:field="*{name}" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">分类id:</label>
+                    <label class="col-sm-3 control-label">分类:</label>
                     <div class="col-sm-8">
                         <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{siteType}"></option>
@@ -30,7 +30,10 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">封面:</label>
                     <div class="col-sm-8">
-                        <input name="cover" th:field="*{cover}" class="form-control" type="text">
+                        <input type="hidden" name="cover" th:field="*{cover}">
+                        <div class="file-loading">
+                            <input class="form-control file-upload" id="cover" name="file" type="file">
+                        </div>
                     </div>
                 </div>
             </div>
@@ -45,25 +48,27 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">价格:</label>
+                    <label class="col-sm-3 control-label is-required">价格:</label>
                     <div class="col-sm-8">
-                        <input name="price" th:field="*{price}" class="form-control" type="text">
+                        <input name="price" th:field="*{price}" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">温馨提示:</label>
+                    <label class="col-sm-3 control-label is-required">温馨提示:</label>
                     <div class="col-sm-8">
-                        <input name="warmReminder" th:field="*{warmReminder}" class="form-control" type="text">
+                        <input name="warmReminder" th:field="*{warmReminder}" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">场馆id:</label>
+                    <label class="col-sm-3 control-label is-required">场馆名称:</label>
                     <div class="col-sm-8">
-                        <input name="venueId" th:field="*{venueId}" class="form-control" type="text">
+                        <select name="venueId" class="form-control" >
+                            <option th:each="post:${beilvSitesList}" th:value="${post.id}" th:text="${post.venueName}" ></option>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -71,6 +76,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: summernote-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
     <script th:inline="javascript">
         var prefix = ctx + "system/site";
         $("#form-site-edit").validate({

+ 12 - 35
qmjszx-admin/src/main/resources/templates/system/site/site.html

@@ -17,29 +17,6 @@
                                 <input type="text" name="name"/>
                             </li>
                             <li>
-                                <label>分类id:</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>
-                                <label>封面:</label>
-                                <input type="text" name="cover"/>
-                            </li>
-                            <li>
-                                <label>价格:</label>
-                                <input type="text" name="price"/>
-                            </li>
-                            <li>
-                                <label>温馨提示:</label>
-                                <input type="text" name="warmReminder"/>
-                            </li>
-                            <li>
-                                <label>场馆id:</label>
-                                <input type="text" name="venueId"/>
-                            </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>
@@ -52,15 +29,15 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:site:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:site:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:site:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:site:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:site:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:site:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:site:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -96,7 +73,7 @@
                 },
                 {
                     field: 'siteType',
-                    title: '分类id',
+                    title: '分类',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(siteTypeDatas, value);
                     }
@@ -126,8 +103,8 @@
                     }
                 },
                 {
-                    field: 'venueId',
-                    title: '场馆id'
+                    field: 'venueName',
+                    title: '场馆名称'
                 },
                 {
                     title: '操作',

+ 22 - 8
qmjszx-admin/src/main/resources/templates/system/venue/add.html

@@ -11,6 +11,14 @@
         <form class="form-horizontal m" id="form-venue-add">
             <div class="col-xs-12">
                 <div class="form-group">
+                    <label class="col-sm-3 control-label is-required">名称:</label>
+                    <div class="col-sm-8">
+                        <input name="venueName" class="form-control" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
                     <label class="col-sm-3 control-label">图片:</label>
                     <div class="col-sm-8">
                         <input type="hidden" name="cover">
@@ -22,26 +30,26 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">地址:</label>
+                    <label class="col-sm-3 control-label is-required">地址:</label>
                     <div class="col-sm-8">
-                        <input name="address" class="form-control" type="text">
+                        <input name="address" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">电话:</label>
+                    <label class="col-sm-3 control-label is-required">电话:</label>
                     <div class="col-sm-8">
-                        <input name="phoneNumber" class="form-control" type="text">
+                        <input id="phoneNumber" name="phoneNumber" placeholder="请输入电话" class="form-control" type="text" maxlength="11" required>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">营业时间:</label>
+                    <label class="col-sm-3 control-label is-required">营业时间:</label>
                     <div class="col-sm-8">
                         <div class="input-group date">
-                            <input name="businessHours" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <input name="businessHours" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                         </div>
                     </div>
@@ -60,7 +68,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">场地服务:</label>
                     <div class="col-sm-8">
-                        <input name="venueService" class="form-control" type="text">
+                        <input name="venueService" class="form-control" type="text" >
                     </div>
                 </div>
             </div>
@@ -81,7 +89,13 @@
     <script th:inline="javascript">
         var prefix = ctx + "system/venue"
         $("#form-venue-add").validate({
-            focusCleanup: true
+            focusCleanup: true,
+            rules:{
+                phoneNumber:{
+                    isPhone:true,
+                },
+            }
+
         });
 
         function submitHandler() {

+ 141 - 127
qmjszx-admin/src/main/resources/templates/system/venue/edit.html

@@ -1,157 +1,171 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('修改场馆信息')" />
-    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: header('修改场馆信息')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
     <th:block th:include="include :: bootstrap-fileinput-css"/>
-    <th:block th:include="include :: summernote-css" />
+    <th:block th:include="include :: summernote-css"/>
 </head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-venue-edit" th:object="${beilvVenue}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">图片:</label>
-                    <div class="col-sm-8">
-                        <input type="hidden" name="cover" th:field="*{cover}">
-                       <div class="file-loading">
-                            <input class="form-control file-upload" id="cover" name="file" type="file">
-                        </div>
-                    </div>
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-venue-edit" th:object="${beilvVenue}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">名称:</label>
+                <div class="col-sm-8">
+                    <input name="venueName" th:field="*{venueName}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">地址:</label>
-                    <div class="col-sm-8">
-                        <input name="address" th:field="*{address}" class="form-control" type="text">
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">图片:</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="cover" th:field="*{cover}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="cover" name="file" type="file">
                     </div>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">电话:</label>
-                    <div class="col-sm-8">
-                        <input name="phoneNumber" th:field="*{phoneNumber}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">地址:</label>
+                <div class="col-sm-8">
+                    <input name="address" th:field="*{address}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">营业时间:</label>
-                    <div class="col-sm-8">
-                        <div class="input-group date">
-                            <input name="businessHours" th:value="${#dates.format(beilvVenue.businessHours, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        </div>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">电话:</label>
+                <div class="col-sm-8">
+                    <input name="phoneNumber" th:field="*{phoneNumber}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">场馆介绍:</label>
-                    <div class="col-sm-8">
-                        <input type="hidden" class="form-control" th:field="*{venueIntroduction}">
-                        <div class="summernote" id="venueIntroduction"></div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">营业时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="businessHours" th:value="${#dates.format(beilvVenue.businessHours, 'yyyy-MM-dd')}"
+                               class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">场地服务:</label>
-                    <div class="col-sm-8">
-                        <input name="venueService" th:field="*{venueService}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">场馆介绍:</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" th:field="*{venueIntroduction}">
+                    <div class="summernote" id="venueIntroduction"></div>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">开始前N分钟不可预定:</label>
-                    <div class="col-sm-8">
-                        <input name="thresholdValue" th:field="*{thresholdValue}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">场地服务:</label>
+                <div class="col-sm-8">
+                    <input name="venueService" th:field="*{venueService}" class="form-control" type="text">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">开始前N分钟不可预定:</label>
+                <div class="col-sm-8">
+                    <input name="thresholdValue" th:field="*{thresholdValue}" class="form-control" type="text">
                 </div>
             </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <th:block th:include="include :: bootstrap-fileinput-js"/>
-    <th:block th:include="include :: summernote-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "system/venue";
-        $("#form-venue-edit").validate({
-            focusCleanup: true
-        });
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: bootstrap-fileinput-js"/>
+<th:block th:include="include :: summernote-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "system/venue";
+    $("#form-venue-edit").validate({
+        focusCleanup: true,
+        rules:{
+            phoneNumber:{
+                isPhone:true,
+            },
+        }
+    });
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-venue-edit').serialize());
-            }
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-venue-edit').serialize());
         }
+    }
 
-        $("input[name='businessHours']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
+    $("input[name='businessHours']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
 
-        $(".file-upload").each(function (i) {
-            var val = $("input[name='" + this.id + "']").val()
-            $(this).fileinput({
-                'uploadUrl': ctx + 'common/upload',
-                initialPreviewAsData: true,
-                initialPreview: [val],
-                maxFileCount: 1,
-                autoReplace: true
-            }).on('fileuploaded', function (event, data, previewId, index) {
-                $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
-            }).on('fileremoved', function (event, id, index) {
-                $("input[name='" + event.currentTarget.id + "']").val('')
-            })
-            $(this).fileinput('_initFileActions');
-        });
+    $(".file-upload").each(function (i) {
+        var val = $("input[name='" + this.id + "']").val()
+        $(this).fileinput({
+            'uploadUrl': ctx + 'common/upload',
+            initialPreviewAsData: true,
+            initialPreview: [val],
+            maxFileCount: 1,
+            autoReplace: true
+        }).on('fileuploaded', function (event, data, previewId, index) {
+            $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+        }).on('fileremoved', function (event, id, index) {
+            $("input[name='" + event.currentTarget.id + "']").val('')
+        })
+        $(this).fileinput('_initFileActions');
+    });
 
-        $(function() {
-            $('.summernote').each(function(i) {
-                $('#' + this.id).summernote({
-                    lang: 'zh-CN',
-                    dialogsInBody: true,
-                    callbacks: {
-                        onChange: function(contents, $edittable) {
-                            $("input[name='" + this.id + "']").val(contents);
-                        },
-                        onImageUpload: function(files) {
-                            var obj = this;
-                            var data = new FormData();
-                            data.append("file", files[0]);
-                            $.ajax({
-                                type: "post",
-                                url: ctx + "common/upload",
-                                data: data,
-                                cache: false,
-                                contentType: false,
-                                processData: false,
-                                dataType: 'json',
-                                success: function(result) {
-                                    if (result.code == web_status.SUCCESS) {
-                                        $('#' + obj.id).summernote('insertImage', result.url);
-                                    } else {
-                                        $.modal.alertError(result.msg);
-                                    }
-                                },
-                                error: function(error) {
-                                    $.modal.alertWarning("图片上传失败。");
+    $(function () {
+        $('.summernote').each(function (i) {
+            $('#' + this.id).summernote({
+                lang: 'zh-CN',
+                dialogsInBody: true,
+                callbacks: {
+                    onChange: function (contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function (files) {
+                        var obj = this;
+                        var data = new FormData();
+                        data.append("file", files[0]);
+                        $.ajax({
+                            type: "post",
+                            url: ctx + "common/upload",
+                            data: data,
+                            cache: false,
+                            contentType: false,
+                            processData: false,
+                            dataType: 'json',
+                            success: function (result) {
+                                if (result.code == web_status.SUCCESS) {
+                                    $('#' + obj.id).summernote('insertImage', result.url);
+                                } else {
+                                    $.modal.alertError(result.msg);
                                 }
-                            });
-                        }
+                            },
+                            error: function (error) {
+                                $.modal.alertWarning("图片上传失败。");
+                            }
+                        });
                     }
-                });
-                var content = $("input[name='" + this.id + "']").val();
-                $('#' + this.id).summernote('code', content);
-            })
-        });
-    </script>
+                }
+            });
+            var content = $("input[name='" + this.id + "']").val();
+            $('#' + this.id).summernote('code', content);
+        })
+    });
+</script>
 </body>
 </html>

+ 63 - 73
qmjszx-admin/src/main/resources/templates/system/venue/venue.html

@@ -1,86 +1,76 @@
 <!DOCTYPE html>
 <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 :: header('场馆信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>地址:</label>
-                                <input type="text" name="address"/>
-                            </li>
-                            <li>
-                                <label>电话:</label>
-                                <input type="text" name="phoneNumber"/>
-                            </li>
-                            <li>
-                                <label>营业时间:</label>
-                                <input type="text" class="time-input" placeholder="请选择营业时间" name="businessHours"/>
-                            </li>
-                            <li>
-                                <label>场地服务:</label>
-                                <input type="text" name="venueService"/>
-                            </li>
-                            <li>
-                                <label>开始前N分钟不可预定:</label>
-                                <input type="text" name="thresholdValue"/>
-                            </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>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>名称:</label>
+                            <input type="text" name="venueName"/>
+                        </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>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:venue:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:venue:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:venue:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:venue:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:venue:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:venue:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:venue:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:venue:export">-->
+            <!--                    <i class="fa fa-download"></i> 导出-->
+            <!--                </a>-->
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:venue:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:venue:remove')}]];
-        var prefix = ctx + "system/venue";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:venue:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:venue:remove')}]];
+    var prefix = ctx + "system/venue";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "场馆信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "场馆信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: 'id',
                     visible: false
                 },
                 {
+                    field: 'venueName',
+                    title: '名称'
+                },
+                {
                     field: 'cover',
                     title: '图片'
                 },
@@ -111,16 +101,16 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    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);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

+ 8 - 1
qmjszx-business/src/main/java/beilv/session/controller/BeilvSessionController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import beilv.session.domain.BeilvSession;
 import beilv.session.service.IBeilvSessionService;
+import beilv.venue.domain.BeilvVenue;
+import beilv.venue.service.IBeilvVenueService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,6 +37,9 @@ public class BeilvSessionController extends BaseController {
     @Autowired
     private IBeilvSessionService beilvSessionService;
 
+    @Autowired
+    private IBeilvVenueService beilvVenueService;
+
     @RequiresPermissions("system:session:view")
     @GetMapping()
     public String session() {
@@ -71,7 +76,9 @@ public class BeilvSessionController extends BaseController {
      */
     @RequiresPermissions("system:session:add")
     @GetMapping("/add")
-    public String add() {
+    public String add(ModelMap mmap) {
+        List<BeilvVenue> beilvSitesList = beilvVenueService.selectBeilvVenueList(new BeilvVenue());
+        mmap.put("beilvSitesList", beilvSitesList);
         return prefix + "/add";
     }
 

+ 9 - 0
qmjszx-business/src/main/java/beilv/session/domain/BeilvSession.java

@@ -1,6 +1,8 @@
 package beilv.session.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import beilv.common.annotation.Excel;
@@ -12,6 +14,7 @@ import beilv.common.core.domain.BaseEntity;
  * @author lc
  * @date 2025-01-06
  */
+@Data
 public class BeilvSession extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -23,6 +26,10 @@ public class BeilvSession extends BaseEntity
     @Excel(name = "分类id")
     private String siteType;
 
+    /** 排序 */
+    @Excel(name = "排序")
+    private String sort;
+
     /** 时段 */
     @Excel(name = "时段")
     private String session;
@@ -35,6 +42,8 @@ public class BeilvSession extends BaseEntity
     @Excel(name = "场馆id")
     private Long venueId;
 
+    private String venueName;
+
     public void setId(Long id) 
     {
         this.id = id;

+ 16 - 1
qmjszx-business/src/main/java/beilv/site/controller/BeilvSiteController.java

@@ -2,6 +2,8 @@ package beilv.site.controller;
 
 import java.util.List;
 
+import beilv.venue.domain.BeilvVenue;
+import beilv.venue.service.IBeilvVenueService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,6 +36,10 @@ public class BeilvSiteController extends BaseController {
     @Autowired
     private IBeilvSiteService beilvSiteService;
 
+    @Autowired
+    private IBeilvVenueService beilvVenueService;
+
+
     @RequiresPermissions("system:site:view")
     @GetMapping()
     public String site() {
@@ -70,7 +76,9 @@ public class BeilvSiteController extends BaseController {
      */
     @RequiresPermissions("system:site:add")
     @GetMapping("/add")
-    public String add() {
+    public String add(ModelMap mmap) {
+        List<BeilvVenue> beilvSitesList = beilvVenueService.selectBeilvVenueList(new BeilvVenue());
+        mmap.put("beilvSitesList", beilvSitesList);
         return prefix + "/add";
     }
 
@@ -92,6 +100,8 @@ public class BeilvSiteController extends BaseController {
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         BeilvSite beilvSite = beilvSiteService.selectBeilvSiteById(id);
+        List<BeilvVenue> beilvSitesList = beilvVenueService.selectBeilvVenueList(new BeilvVenue());
+        mmap.put("beilvSitesList", beilvSitesList);
         mmap.put("beilvSite", beilvSite);
         return prefix + "/edit";
     }
@@ -125,4 +135,9 @@ public class BeilvSiteController extends BaseController {
     public AjaxResult remove(String ids) {
         return toAjax(beilvSiteService.deleteBeilvSiteByIds(ids));
     }
+
+    @GetMapping("/selectStadium")
+    public AjaxResult selectStadium() {
+        return AjaxResult.success(beilvSiteService.selectBeilvSiteList(new BeilvSite()));
+    }
 }

+ 5 - 0
qmjszx-business/src/main/java/beilv/site/domain/BeilvSite.java

@@ -1,6 +1,8 @@
 package beilv.site.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import beilv.common.annotation.Excel;
@@ -12,6 +14,7 @@ import beilv.common.core.domain.BaseEntity;
  * @author lc
  * @date 2025-01-06
  */
+@Data
 public class BeilvSite extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -51,6 +54,8 @@ public class BeilvSite extends BaseEntity
     @Excel(name = "场馆id")
     private Long venueId;
 
+    private String venueName;
+
     public void setId(Long id) 
     {
         this.id = id;

+ 5 - 0
qmjszx-business/src/main/java/beilv/site/service/impl/BeilvSiteServiceImpl.java

@@ -2,6 +2,7 @@ package beilv.site.service.impl;
 
 import java.util.List;
 
+import beilv.system.domain.SysPost;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import beilv.site.mapper.BeilvSiteMapper;
@@ -31,6 +32,8 @@ public class BeilvSiteServiceImpl implements IBeilvSiteService {
         return beilvSiteMapper.selectBeilvSiteById(id);
     }
 
+
+
     /**
      * 查询球场管理列表
      *
@@ -99,4 +102,6 @@ public class BeilvSiteServiceImpl implements IBeilvSiteService {
     public List<BeilvSite> getAllToList() {
         return beilvSiteMapper.getAllToList();
     }
+
+
 }

+ 6 - 0
qmjszx-business/src/main/java/beilv/venue/domain/BeilvVenue.java

@@ -2,6 +2,7 @@ package beilv.venue.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import beilv.common.annotation.Excel;
@@ -13,6 +14,7 @@ import beilv.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-06
  */
+@Data
 public class BeilvVenue extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -24,6 +26,10 @@ public class BeilvVenue extends BaseEntity
     @Excel(name = "图片")
     private String cover;
 
+    /** 名称 */
+    @Excel(name = "名称")
+    private String venueName;
+
     /** 地址 */
     @Excel(name = "地址")
     private String address;

+ 1 - 0
qmjszx-business/src/main/java/beilv/venue/service/IBeilvVenueService.java

@@ -60,4 +60,5 @@ public interface IBeilvVenueService
      * @return 结果
      */
     public int deleteBeilvVenueById(Long id);
+
 }

+ 28 - 4
qmjszx-business/src/main/resources/mapper/session/BeilvSessionMapper.xml

@@ -10,25 +10,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="session"    column="session"    />
         <result property="price"    column="price"    />
         <result property="venueId"    column="venue_id"    />
+        <result property="sort"    column="sort"    />
+        <result property="venueName"    column="venue_name"    />
     </resultMap>
 
     <sql id="selectBeilvSessionVo">
-        select id, site_type, session, price, venue_id from beilv_session
+        select id, site_type, session, price, venue_id,sort from beilv_session
     </sql>
 
     <select id="selectBeilvSessionList" parameterType="BeilvSession" resultMap="BeilvSessionResult">
-        <include refid="selectBeilvSessionVo"/>
+        SELECT
+        bs.id,
+        bs.site_type,
+        bs.SESSION,
+        bs.price,
+        bs.venue_id,
+        bs.sort,
+        bv.venue_name
+        FROM
+        beilv_session bs
+        left join beilv_venue bv on bs.venue_id = bv.id
         <where>  
             <if test="siteType != null  and siteType != ''"> and site_type = #{siteType}</if>
             <if test="session != null  and session != ''"> and session = #{session}</if>
             <if test="price != null "> and price = #{price}</if>
             <if test="venueId != null "> and venue_id = #{venueId}</if>
         </where>
+        order by sort ASC
     </select>
     
     <select id="selectBeilvSessionById" parameterType="Long" resultMap="BeilvSessionResult">
-        <include refid="selectBeilvSessionVo"/>
-        where id = #{id}
+        SELECT bs.id,
+               bs.site_type,
+               bs.SESSION,
+               bs.price,
+               bs.venue_id,
+               bs.sort,
+               bv.venue_name
+        FROM beilv_session bs
+                 left join beilv_venue bv on bs.venue_id = bv.id
+        where bs.id = #{id}
     </select>
 
     <insert id="insertBeilvSession" parameterType="BeilvSession">
@@ -39,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="session != null">session,</if>
             <if test="price != null">price,</if>
             <if test="venueId != null">venue_id,</if>
+            <if test="sort != null">sort,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -46,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="session != null">#{session},</if>
             <if test="price != null">#{price},</if>
             <if test="venueId != null">#{venueId},</if>
+            <if test="sort != null">#{sort},</if>
          </trim>
     </insert>
 
@@ -56,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="session != null">session = #{session},</if>
             <if test="price != null">price = #{price},</if>
             <if test="venueId != null">venue_id = #{venueId},</if>
+            <if test="sort != null">sort = #{sort},</if>
         </trim>
         where id = #{id}
     </update>

+ 32 - 11
qmjszx-business/src/main/resources/mapper/site/BeilvSiteMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warmReminder"    column="warm_reminder"    />
         <result property="siteStatus"    column="site_status"    />
         <result property="venueId"    column="venue_id"    />
+        <result property="venueName"    column="venue_name"    />
     </resultMap>
 
     <sql id="selectBeilvSiteVo">
@@ -21,22 +22,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBeilvSiteList" parameterType="BeilvSite" resultMap="BeilvSiteResult">
-        <include refid="selectBeilvSiteVo"/>
+        SELECT
+        bs.id,
+        bs.NAME,
+        bs.site_type,
+        bs.cover,
+        bs.intro,
+        bs.price,
+        bs.warm_reminder,
+        bs.site_status,
+        bs.venue_id,
+        bv.venue_name
+        FROM
+        beilv_site bs
+        left join beilv_venue bv on bs.venue_id = bv.id
         <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="siteType != null  and siteType != ''"> and site_type = #{siteType}</if>
-            <if test="cover != null  and cover != ''"> and cover = #{cover}</if>
-            <if test="intro != null  and intro != ''"> and intro = #{intro}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="warmReminder != null  and warmReminder != ''"> and warm_reminder = #{warmReminder}</if>
-            <if test="siteStatus != null  and siteStatus != ''"> and site_status = #{siteStatus}</if>
-            <if test="venueId != null "> and venue_id = #{venueId}</if>
+            <if test="name != null  and name != ''"> and bs.name like concat('%', #{name}, '%')</if>
+            <if test="siteType != null  and siteType != ''"> and bs.site_type = #{siteType}</if>
         </where>
     </select>
     
     <select id="selectBeilvSiteById" parameterType="Long" resultMap="BeilvSiteResult">
-        <include refid="selectBeilvSiteVo"/>
-        where id = #{id}
+        SELECT
+            bs.id,
+            bs.NAME,
+            bs.site_type,
+            bs.cover,
+            bs.intro,
+            bs.price,
+            bs.warm_reminder,
+            bs.site_status,
+            bs.venue_id,
+            bv.venue_name
+        FROM
+            beilv_site bs
+                left join beilv_venue bv on bs.venue_id = bv.id
+        where bs.id = #{id}
     </select>
 
     <insert id="insertBeilvSite" parameterType="BeilvSite" useGeneratedKeys="true" keyProperty="id">

+ 7 - 2
qmjszx-business/src/main/resources/mapper/venue/BeilvVenueMapper.xml

@@ -13,15 +13,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="venueIntroduction"    column="venue_introduction"    />
         <result property="venueService"    column="venue_service"    />
         <result property="thresholdValue"    column="threshold_value"    />
+        <result property="venueName"    column="venue_name"    />
     </resultMap>
 
     <sql id="selectBeilvVenueVo">
-        select id, cover, address, phone_number, business_hours, venue_introduction, venue_service, threshold_value from beilv_venue
+        select id, cover, address, phone_number, business_hours, venue_introduction, venue_service, threshold_value,venue_name from beilv_venue
     </sql>
 
     <select id="selectBeilvVenueList" parameterType="BeilvVenue" resultMap="BeilvVenueResult">
         <include refid="selectBeilvVenueVo"/>
-        <where>  
+        <where>
+            <if test="venueName != null  and venueName != ''"> and venue_name like concat('%', #{venueName}, '%')</if>
             <if test="cover != null  and cover != ''"> and cover = #{cover}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="venueIntroduction != null">venue_introduction,</if>
             <if test="venueService != null">venue_service,</if>
             <if test="thresholdValue != null">threshold_value,</if>
+            <if test="venueName != null">venue_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="venueIntroduction != null">#{venueIntroduction},</if>
             <if test="venueService != null">#{venueService},</if>
             <if test="thresholdValue != null">#{thresholdValue},</if>
+            <if test="venueName != null">#{venueName},</if>
          </trim>
     </insert>
 
@@ -71,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="venueIntroduction != null">venue_introduction = #{venueIntroduction},</if>
             <if test="venueService != null">venue_service = #{venueService},</if>
             <if test="thresholdValue != null">threshold_value = #{thresholdValue},</if>
+            <if test="venueName != null">venue_name = #{venueName},</if>
         </trim>
         where id = #{id}
     </update>