营业时间，双排，球场状态

qmjszx-admin/src/main/resources/templates/competition/add.html

@@ -95,11 +95,20 @@
                     <input type="hidden" class="form-control" name="competitionDetails" required>
                     <div class="summernote" id="competitionDetails"></div>
                 </div>
+
+
+
+
                 <label class="col-sm-2 control-label">报名须知：</label>
                 <div class="col-sm-4">
                     <input type="hidden" class="form-control" name="registrationNotes">
                     <div class="summernote" id="registrationNotes"></div>
                 </div>
+
+
+
+
+
             </div>
         </div>
     </form>

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

@@ -134,14 +134,14 @@
             }
         }
 
-        /* 用户管理-停用 */
+        /* 商品状态-下架 */
         function disable(id) {
             $.modal.confirm("确认要下架商品吗？", function() {
                 $.operate.post(prefix + "/goodsStatus", { "id": id, "goodsState": 2 });
             })
         }
 
-        /* 用户管理启用 */
+        /* 商品状态-下架 */
         function enable(id) {
             $.modal.confirm("确认要上架商品吗？", function() {
                 $.operate.post(prefix + "/goodsStatus", { "id": id, "goodsState": 1 });

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

@@ -20,25 +20,25 @@
         </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="sort" th:field="*{sort}" class="form-control" type="text">
+                    <input name="sort" th:field="*{sort}" 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="session" th:field="*{session}" class="form-control" type="text">
+                    <input name="session" th:field="*{session}" 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="price" th:field="*{price}" class="form-control" type="text">
+                    <input name="price" th:field="*{price}" class="form-control" type="text" required>
                 </div>
             </div>
         </div>

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

@@ -97,6 +97,7 @@
                     title: '温馨提示'
                 },
                 {
+                    visible: editFlag == 'hidden' ? false : true,
                     field: 'siteStatus',
                     title: '状态',
                     align: 'center',
@@ -122,28 +123,28 @@
             $.table.init(options);
         });
 
+
+        /* 球场状态显示 */
         function statusTools(row) {
-            if (row.siteStatus === "1") {
-                return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
+            if (row.siteStatus == 1) {
+                return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';
             } else {
-                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
             }
         }
 
-        /* 用户管理-停用 */
-        function disable(userId) {
-            alert("停用")
-            // $.modal.confirm("确认要停用用户吗？", function() {
-            //     $.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
-            // })
+        /* 球场状态-停用 */
+        function disable(id) {
+            $.modal.confirm("确认要停用该球场吗？", function() {
+                $.operate.post(prefix + "/siteStatus", { "id": id, "siteStatus": 1 });
+            })
         }
 
-        /* 用户管理启用 */
-        function enable(userId) {
-            alert("开启")
-            // $.modal.confirm("确认要启用用户吗？", function() {
-            //     $.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 0 });
-            // })
+        /* 球场状态启用 */
+        function enable(id) {
+            $.modal.confirm("确认要启用该球场吗？", function() {
+                $.operate.post(prefix + "/siteStatus", { "id": id, "siteStatus": 0 });
+            })
         }
     </script>
 </body>

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

@@ -11,70 +11,51 @@
         <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">
+                    <label class="col-sm-2 control-label is-required">名称：</label>
+                    <div class="col-sm-4">
                         <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 is-required">地址：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-2 control-label is-required">地址：</label>
+                    <div class="col-sm-4">
                         <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 is-required">电话：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-2 control-label is-required">电话：</label>
+                    <div class="col-sm-4">
                         <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 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" required>
-                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        </div>
+                    <label class="col-sm-2 control-label is-required">营业时间：</label>
+                    <div class="col-sm-4">
+                        <input name="businessHours" 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">
+                    <label class="col-sm-2 control-label">场地服务：</label>
+                    <div class="col-sm-4">
                         <input name="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">开始前几分钟不可预定：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-2 control-label">开始前几分钟不可预定：</label>
+                    <div class="col-sm-4">
                         <input name="thresholdValue" 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">
+                    <label class="col-sm-2 control-label">图片：</label>
+                    <div class="col-sm-4">
                         <input type="hidden" name="cover">
                         <div class="file-loading">
                             <input class="form-control file-upload" id="cover" name="file" type="file" multiple>
                         </div>
                     </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">
+                    <label class="col-sm-2 control-label">场馆介绍：</label>
+                    <div class="col-sm-4">
                         <input type="hidden" class="form-control" name="venueIntroduction">
                         <div class="summernote" id="venueIntroduction"></div>
                     </div>
@@ -97,6 +78,9 @@
                 thresholdValue:{
                     digits: true
                 },
+                businessHours:{
+                    isTimeRange: true
+                }
             }
 
         });
@@ -146,6 +130,7 @@
             $('.summernote').summernote({
                 lang: 'zh-CN',
                 dialogsInBody: true,
+                height: 240,
                 callbacks: {
                     onChange: function(contents, $edittable) {
                         $("input[name='" + this.id + "']").val(contents);

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

@@ -39,11 +39,7 @@
             <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>
+                    <input name="businessHours" th:field="*{businessHours}" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
@@ -98,6 +94,12 @@
             phoneNumber:{
                 isPhone:true,
             },
+            thresholdValue:{
+                digits: true
+            },
+            businessHours:{
+                isTimeRange: true
+            }
         }
     });
 

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

@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:venue:add">
+            <a class="btn btn-success" onclick="$.operate.addToSet()" 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">-->

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

@@ -2,6 +2,7 @@ package beilv.site.controller;
 
 import java.util.List;
 
+import beilv.shopping.domain.QmjsShoppingMall;
 import beilv.venue.domain.BeilvVenue;
 import beilv.venue.service.IBeilvVenueService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -140,4 +141,16 @@ public class BeilvSiteController extends BaseController {
     public AjaxResult selectStadium() {
         return AjaxResult.success(beilvSiteService.selectBeilvSiteList(new BeilvSite()));
     }
+
+    /**
+     * 球场状态修改
+     */
+    @Log(title = "球场管理", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:site:edit")
+    @PostMapping("/siteStatus")
+    @ResponseBody
+    public AjaxResult siteStatus(BeilvSite beilvSite)
+    {
+        return toAjax(beilvSiteService.siteStatus(beilvSite));
+    }
 }

qmjszx-business/src/main/java/beilv/site/service/IBeilvSiteService.java

@@ -60,4 +60,9 @@ public interface IBeilvSiteService
     public int deleteBeilvSiteById(Long id);
 
     List<BeilvSite> getAllToList();
+
+    /**
+     * 球场状态修改
+     */
+    int siteStatus(BeilvSite beilvSite);
 }

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.shopping.domain.QmjsShoppingMall;
 import beilv.system.domain.SysPost;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,6 +103,14 @@ public class BeilvSiteServiceImpl implements IBeilvSiteService {
     public List<BeilvSite> getAllToList() {
         return beilvSiteMapper.getAllToList();
     }
+    /**
+     * 球场状态修改
+     */
+    @Override
+    public int siteStatus(BeilvSite beilvSite)
+    {
+        return beilvSiteMapper.updateBeilvSite(beilvSite);
+    }
 
 
 }

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null "> and price = #{price}</if>
             <if test="venueId != null "> and venue_id = #{venueId}</if>
         </where>
-        order by sort ASC
+        order by site_type asc,sort ASC
     </select>
     
     <select id="selectBeilvSessionById" parameterType="Long" resultMap="BeilvSessionResult">