Startseite Erkunden Hilfe
Registrieren Anmelden
limeng
/
qmjszx
Beobachten 1
Favorit hinzufügen 0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

场馆删除验证

lchao vor 5 Monaten
Ursprung
fef547f84f
Commit
d51333e147
10 geänderte Dateien mit 53 neuen und 28 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 0 7
      qmjszx-admin/src/main/resources/templates/system/venue/add.html
  2. 0 7
      qmjszx-admin/src/main/resources/templates/system/venue/edit.html
  3. 2 1
      qmjszx-admin/src/main/resources/templates/system/venue/venue.html
  4. 4 0
      qmjszx-business/src/main/java/beilv/session/mapper/BeilvSessionMapper.java
  5. 2 0
      qmjszx-business/src/main/java/beilv/site/mapper/BeilvSiteMapper.java
  6. 1 13
      qmjszx-business/src/main/java/beilv/venue/domain/BeilvVenue.java
  7. 4 0
      qmjszx-business/src/main/java/beilv/venue/service/IBeilvVenueService.java
  8. 32 0
      qmjszx-business/src/main/java/beilv/venue/service/impl/BeilvVenueServiceImpl.java
  9. 4 0
      qmjszx-business/src/main/resources/mapper/session/BeilvSessionMapper.xml
  10. 4 0
      qmjszx-business/src/main/resources/mapper/site/BeilvSiteMapper.xml

+ 0 - 7
qmjszx-admin/src/main/resources/templates/system/venue/add.html
Datei anzeigen 

@@ -2,7 +2,6 @@
 
 <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 :: bootstrap-fileinput-css"/>
 
     <th:block th:include="include :: summernote-css" />
 
 </head>
 
@@ -64,7 +63,6 @@
 
         </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">
 
@@ -91,11 +89,6 @@
 
             }
 
         }
 
 
-        $("input[name='businessHours']").datetimepicker({
 
-            format: "yyyy-mm-dd",
 
-            minView: "month",
 
-            autoclose: true
 
-        });
 
 
         $(".file-upload").fileinput({
 
             uploadUrl: ctx + 'common/upload',

+ 0 - 7
qmjszx-admin/src/main/resources/templates/system/venue/edit.html
Datei anzeigen 

@@ -2,7 +2,6 @@
 
 <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 :: bootstrap-fileinput-css"/>
 
     <th:block th:include="include :: summernote-css"/>
 
 </head>
 
@@ -83,7 +82,6 @@
 
     </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">
 
@@ -109,11 +107,6 @@
 
         }
 
     }
 
 
-    $("input[name='businessHours']").datetimepicker({
 
-        format: "yyyy-mm-dd",
 
-        minView: "month",
 
-        autoclose: true
 
-    });
 
 
     $(".file-upload").each(function (i) {
 
         var inputName = this.id;

+ 2 - 1
qmjszx-admin/src/main/resources/templates/system/venue/venue.html
Datei anzeigen 

@@ -89,7 +89,8 @@
 
                 },
 
                 {
 
                     field: 'venueIntroduction',
 
-                    title: '场馆介绍'
 
+                    title: '场馆介绍',
 
+                    visible: false
 
                 },
 
                 {
 
                     field: 'venueService',

+ 4 - 0
qmjszx-business/src/main/java/beilv/session/mapper/BeilvSessionMapper.java
Datei anzeigen 

@@ -13,6 +13,8 @@ import java.util.List;
 
  */
 
 public interface BeilvSessionMapper 
 {
 
+
 
+
 
     /**
 
      * 查询时段管理
 
      * 
@@ -69,4 +71,6 @@ public interface BeilvSessionMapper
 
     boolean selectOne(BeilvSession beilvSession);
 
 
     List<BeilvSession> getAllToList();
 
+
 
+    public int countSessionByVenueId(Long venueId);
 
 }

+ 2 - 0
qmjszx-business/src/main/java/beilv/site/mapper/BeilvSiteMapper.java
Datei anzeigen 

@@ -62,4 +62,6 @@ public interface BeilvSiteMapper
 
     boolean selectOne(BeilvSite beilvSite);
 
 
     List<BeilvSite> getAllToList();
 
+
 
+    int countSiteByVenueId(Long venueId);
 
 }

+ 1 - 13
qmjszx-business/src/main/java/beilv/venue/domain/BeilvVenue.java
Datei anzeigen 

@@ -39,9 +39,7 @@ public class BeilvVenue extends BaseEntity
 
     private String phoneNumber;
 
 
     /** 营业时间 */
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 
-    @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd")
 
-    private Date businessHours;
 
+    private String businessHours;
 
 
     /** 场馆介绍 */
 
     @Excel(name = "场馆介绍")
 
@@ -95,16 +93,6 @@ public class BeilvVenue extends BaseEntity
 
         return phoneNumber;
 
     }
 
 
-    public void setBusinessHours(Date businessHours) 
-    {
 
-        this.businessHours = businessHours;
 
-    }
 
-
 
-    public Date getBusinessHours() 
-    {
 
-        return businessHours;
 
-    }
 
-
 
     public void setVenueIntroduction(String venueIntroduction) 
     {
 
         this.venueIntroduction = venueIntroduction;

+ 4 - 0
qmjszx-business/src/main/java/beilv/venue/service/IBeilvVenueService.java
Datei anzeigen 

@@ -53,6 +53,10 @@ public interface IBeilvVenueService
 
      */
 
     public int deleteBeilvVenueByIds(String ids);
 
 
+    int countSessionByVenueId(Long venueId);
 
+
 
+    int countSiteByVenueId(Long venueId);
 
+
 
     /**
 
      * 删除场馆信息信息
 
      *

+ 32 - 0
qmjszx-business/src/main/java/beilv/venue/service/impl/BeilvVenueServiceImpl.java
Datei anzeigen 

@@ -2,6 +2,9 @@ package beilv.venue.service.impl;
 
 
 import java.util.List;
 
 
+import beilv.common.exception.ServiceException;
 
+import beilv.session.mapper.BeilvSessionMapper;
 
+import beilv.site.mapper.BeilvSiteMapper;
 
 import beilv.venue.domain.BeilvVenue;
 
 import beilv.venue.mapper.BeilvVenueMapper;
 
 import beilv.venue.service.IBeilvVenueService;
 
@@ -22,6 +25,12 @@ public class BeilvVenueServiceImpl implements IBeilvVenueService
 
     @Autowired
 
     private BeilvVenueMapper beilvVenueMapper;
 
 
+    @Autowired
 
+    private BeilvSiteMapper beilvSiteMapper;
 
+
 
+    @Autowired
 
+    private BeilvSessionMapper beilvSessionMapper;
 
+
 
     /**
 
      * 查询场馆信息
 
      * 
@@ -79,8 +88,31 @@ public class BeilvVenueServiceImpl implements IBeilvVenueService
 
     @Override
 
     public int deleteBeilvVenueByIds(String ids)
 
     {
 
+        Long[] venueIds = Convert.toLongArray(ids);
 
+
 
+        // 检查场馆是否绑定了球场或时段
 
+        for (Long venueId : venueIds) {
 
+            BeilvVenue beilvVenue = selectBeilvVenueById(venueId);
 
+            if (countSessionByVenueId(venueId) > 0 || countSiteByVenueId(venueId) > 0)
 
+            {
 
+                throw new ServiceException(String.format("%1$s已分配,不能删除", beilvVenue.getVenueName()));
 
+            }
 
+        }
 
         return beilvVenueMapper.deleteBeilvVenueByIds(Convert.toStrArray(ids));
 
     }
 
+    @Override
 
+    public int countSessionByVenueId(Long venueId)
 
+    {
 
+        return beilvSessionMapper.countSessionByVenueId(venueId);
 
+    }
 
+
 
+    /**
 
+     * 检查场馆是否绑定了球场
 
+     */
 
+    @Override
 
+    public int countSiteByVenueId(Long venueId) {
 
+        return beilvSiteMapper.countSiteByVenueId(venueId);
 
+    }
 
 
     /**
 
      * 删除场馆信息信息

+ 4 - 0
qmjszx-business/src/main/resources/mapper/session/BeilvSessionMapper.xml
Datei anzeigen 

@@ -120,4 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         select * from beilv_session
 
     </select>
 
 
+    <select id="countSessionByVenueId" resultType="Integer">
 
+        select count(1) from beilv_session where venue_id = #{venueId}
 
+    </select>
 
+
 
 </mapper>

+ 4 - 0
qmjszx-business/src/main/resources/mapper/site/BeilvSiteMapper.xml
Datei anzeigen 

@@ -135,4 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         select * from beilv_site
 
     </select>
 
 
+    <select id="countSiteByVenueId" resultType="Integer">
 
+        select count(1) from beilv_site where venue_id = #{venueId}
 
+    </select>
 
+
 
 </mapper>