修改错误字段名称

qmjszx-admin/src/main/java/beilv/web/controller/bootacourse/bootACourseController.java

@@ -121,7 +121,7 @@ public class bootACourseController extends BaseController {
     @PostMapping("/getTicketList")
     public AjaxResult getTicketList(@RequestBody AdmissionTicket admissionTicket){
         //设置查询状态: 可以预定的时段
-        admissionTicket.setAdmissionTicketStatus("0");
+//        admissionTicket.setAdmissionTicketStatus("0");
         //查询可用时段
         List<AdmissionTicket> admissionTickets = ticketService.selectBeilvAdmissionTicketList(admissionTicket);
         return AjaxResult.success(admissionTickets);

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

@@ -25,7 +25,7 @@ public class AdmissionTicket {
     /**
      * 场地名称
      */
-    private String siteName;
+    private String siteId;
     /**
      * 场地类型
      */
@@ -58,4 +58,18 @@ public class AdmissionTicket {
      */
     private int sort;
 
+    private String siteName;
+
+    public AdmissionTicket(String id, String venueId, String siteId, String siteType, String session, BigDecimal price, Date ticketDate, String admissionTicketStatus, String venueName, int sort) {
+        this.id = id;
+        this.venueId = venueId;
+        this.siteId = siteId;
+        this.siteType = siteType;
+        this.session = session;
+        this.price = price;
+        this.ticketDate = ticketDate;
+        this.admissionTicketStatus = admissionTicketStatus;
+        this.venueName = venueName;
+        this.sort = sort;
+    }
 }

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

@@ -7,6 +7,7 @@
     <resultMap type="admissionTicket" id="AdmissionTicketResult">
         <result property="id" column="id"/>
         <result property="venueId" column="venue_id"/>
+        <result property="siteId" column="site_id"/>
         <result property="siteName" column="site_name"/>
         <result property="siteType" column="site_type"/>
         <result property="session" column="session"/>
@@ -19,25 +20,25 @@
 
     <insert id="insertAdmissionTicketToList" parameterType="list">
         insert into beilv_admission_ticket
-        (id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort)
+        (id, venue_id, site_id, site_type, session, price, ticket_date, admission_ticket_status, sort)
         values
         <foreach collection="list" item="ticket" separator=",">
             (
             #{ticket.id},
             #{ticket.venueId},
-            #{ticket.siteName},
+            #{ticket.siteId},
             #{ticket.siteType},
             #{ticket.session},
             #{ticket.price},
             #{ticket.ticketDate},
-            #{ticket.admissionTicketStatus}
+            #{ticket.admissionTicketStatus},
             #{ticket.sort}
             )
         </foreach>
     </insert>
 
     <sql id="selectBeilvAdmissionTicketVo">
-        select id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort
+        select id, venue_id, site_id, site_type, session, price, ticket_date, admission_ticket_status, sort
         from beilv_admission_ticket
     </sql>
 
@@ -45,9 +46,10 @@
         SELECT
         ts.id,
         ts.venue_id,
+        ts.site_id,
         bs.name as site_name,
         ts.site_type,
-        ts.SESSION,
+        ts.session,
         ts.price,
         ts.ticket_date,
         bv.venue_name,
@@ -55,9 +57,9 @@
         ts.sort
         from beilv_admission_ticket ts
         left join beilv_venue bv on ts.venue_id = bv.id
-        left join beilv_site bs on ts.site_name = bs.id
+        left join beilv_site bs on ts.site_id = bs.id
         <where>
-            <if test="siteName != null and siteName != ''">and bs.id = #{siteName}</if>
+            <if test="siteName != null and siteName != ''">and bs.name LIKE CONCAT('%', #{siteName}, '%')  </if>
             <if test="siteType != null and siteType != ''">and ts.site_type = #{siteType}</if>
             <if test="ticketDate != null ">and ts.ticket_date = #{ticketDate}</if>
             <if test="admissionTicketStatus != null  and admissionTicketStatus != ''">
@@ -71,14 +73,14 @@
                 </choose>
             </if>
         </where>
-        order by site_name, sort
+        order by site_id, sort
     </select>
 
     <select id="selectBeilvAdmissionTicketById" parameterType="String" resultMap="AdmissionTicketResult">
         SELECT
             ts.id,
             ts.venue_id,
-            ts.site_name,
+            ts.site_id,
             ts.site_type,
             ts.SESSION,
             ts.price,
@@ -95,7 +97,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="venueId != null">venue_id,</if>
-            <if test="siteName != null">site_name,</if>
+            <if test="siteId != null">site_id,</if>
             <if test="siteType != null">site_type,</if>
             <if test="session != null">session,</if>
             <if test="price != null">price,</if>
@@ -105,7 +107,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="venueId != null">#{venueId},</if>
-            <if test="siteName != null">#{siteName},</if>
+            <if test="siteId != null">#{siteId},</if>
             <if test="siteType != null">#{siteType},</if>
             <if test="session != null">#{session},</if>
             <if test="price != null">#{price},</if>
@@ -118,7 +120,7 @@
         update beilv_admission_ticket
         <trim prefix="SET" suffixOverrides=",">
             <if test="venueId != null">venue_id = #{venueId},</if>
-            <if test="siteName != null">site_name = #{siteName},</if>
+            <if test="siteId != null">site_id = #{siteId},</if>
             <if test="siteType != null">site_type = #{siteType},</if>
             <if test="session != null">session = #{session},</if>
             <if test="price != null">price = #{price},</if>