约球

qmjszx-admin/src/main/java/beilv/web/controller/admissionticket/AdmissionTicketController.java

@@ -6,6 +6,8 @@ import java.util.List;
 
 import beilv.admissionticket.domain.AdmissionTicket;
 import beilv.admissionticket.service.IAdmissionTicketService;
+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;
@@ -36,6 +38,9 @@ public class AdmissionTicketController extends BaseController {
     @Autowired
     private IAdmissionTicketService beilvAdmissionTicketService;
 
+    @Autowired
+    private IBeilvVenueService beilvVenueService;
+
     @RequiresPermissions("admissionticket:AdmissionTicket:view")
     @GetMapping()
     public String AdmissionTicket(ModelMap mmap) {
@@ -73,7 +78,9 @@ public class AdmissionTicketController extends BaseController {
      */
     @RequiresPermissions("admissionticket:AdmissionTicket: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";
     }
 

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

@@ -17,9 +17,11 @@
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">场地名称：</label>
+                    <label class="col-sm-4 control-label is-required">场馆名称：</label>
                     <div class="col-sm-8">
-                        <input name="siteName" 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>

qmjszx-admin/src/main/resources/templates/admissionticket/edit.html

@@ -18,9 +18,11 @@
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">场地名称：</label>
+                    <label class="col-sm-4 control-label is-required">场馆名称：</label>
                     <div class="col-sm-8">
-                        <input name="siteName" th:field="*{siteName}" 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>

qmjszx-business/src/main/java/beilv/admissionticket/domain/AdmissionTicket.java

@@ -48,4 +48,9 @@ public class AdmissionTicket {
      */
     private String admissionTicketStatus;
 
+    /**
+     * 场地名称
+     */
+    private String venueName;
+
 }

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="price" column="price"/>
         <result property="ticketDate" column="ticket_date"/>
         <result property="admissionTicketStatus" column="admission_ticket_status"/>
+        <result property="venueName"    column="venue_name"    />
     </resultMap>
 
     <insert id="insertAdmissionTicketToList" parameterType="list">
@@ -38,7 +39,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBeilvAdmissionTicketList" parameterType="AdmissionTicket" resultMap="AdmissionTicketResult">
-        <include refid="selectBeilvAdmissionTicketVo"/>
+        SELECT
+        ts.id,
+        ts.venue_id,
+        ts.site_name,
+        ts.site_type,
+        ts.SESSION,
+        ts.price,
+        ts.ticket_date,
+        bv.venue_name,
+        ts.admission_ticket_status
+        from beilv_admission_ticket ts
+        left join beilv_venue bv on ts.venue_id = bv.id
         <where>
             <if test="ticketDate != null "> and ticket_date = #{ticketDate}</if>
             <if test="admissionTicketStatus != null  and admissionTicketStatus != ''"> and admission_ticket_status = #{admissionTicketStatus}</if>
@@ -47,8 +59,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectBeilvAdmissionTicketById" parameterType="String" resultMap="AdmissionTicketResult">
-        <include refid="selectBeilvAdmissionTicketVo"/>
-        where id = #{id}
+        SELECT
+            ts.id,
+            ts.venue_id,
+            ts.site_name,
+            ts.site_type,
+            ts.SESSION,
+            ts.price,
+            ts.ticket_date,
+            bv.venue_name,
+            ts.admission_ticket_status
+        from beilv_admission_ticket ts
+                 left join beilv_venue bv on ts.venue_id = bv.id
+        where ts.id = #{id}
     </select>
 
     <insert id="insertBeilvAdmissionTicket" parameterType="AdmissionTicket">

qmjszx-quartz/src/main/java/beilv/quartz/task/SiteTask.java

@@ -57,7 +57,7 @@ public class SiteTask {
                 //判断场馆相同, 并且场地类型相同
                 if (session.getVenueId().equals(site.getVenueId()) && session.getSiteType().equals(site.getSiteType())) {
                     //创建门票实体
-                    AdmissionTicket admissionTicket = new AdmissionTicket(IdUtils.fastSimpleUUID(), String.valueOf(session.getVenueId()), site.getName(), session.getSiteType(), session.getSession(), session.getPrice(), writeDate,"0");
+                    AdmissionTicket admissionTicket = new AdmissionTicket(IdUtils.fastSimpleUUID(), String.valueOf(session.getVenueId()), site.getName(), session.getSiteType(), session.getSession(), session.getPrice(),writeDate,"0", session.getVenueName());
                     ticketList.add(admissionTicket);
                 }
             });