演出列表提交

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
@@ -40,15 +41,16 @@ public class KylinPerformancesController extends BaseController
     @RequiresPermissions("kylin:performances:list")
     @PostMapping("/list")
     @ResponseBody
-    public ResponseDto<PageInfo<PerformanceAdminListDao>> list(PerformanceAdminListParam performanceAdminListParam)
+    public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam)
     {
-        PageInfo<PerformanceAdminListDao> result = null;
-        result = kylinPerformancesService.getList(performanceAdminListParam);
-        if (null != result) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("获取演出详情失败");
-        }
+        startPage();
+//        PageInfo<PerformanceAdminListDao> result = null;
+        return getDataTable(kylinPerformancesService.getList(performanceAdminListParam).getList());
+//        if (null != result) {
+//            return ResponseDto.success(result);
+//        } else {
+//            return ResponseDto.failure("获取演出详情失败");
+//        }
     }
 //
 //    /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

@@ -118,29 +118,29 @@
                     title: '开演时间'
                 },
                 {
-                    field: 'imgPoster',
+                    field: 'totalGeneral',
                     title: '供票总量'
                 },
                 {
-                    field: 'provinceId',
+                    field: 'saleGeneral',
                     title: '实销'
                 },
                 {
-                    field: 'provinceName',
+                    field: 'surplusGeneral',
                     title: '余票'
                 },
                 {
-                    field: 'provinceName',
+                    field: 'totalSalePrice',
                     title: '总销售款'
                 },
                 {
-                    field: 'provinceName',
+                    field: 'statusName',
                     title: '演出状态'
                 },
-                // {
-                //     field: 'provinceName',
-                //     title: '分销状态'
-                // },
+                {
+                    field: 'rejectTxt',
+                    title: '拒绝理由'
+                },
                 // {
                 //     field: 'provinceName',
                 //     title: '转增状态'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -202,8 +202,13 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         PageInfo<PerformanceAdminListDao> pageInfoTmp = null;
         try {
             PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
+            List<PerformanceAdminListDao> newList = new ArrayList();
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
-            pageInfoTmp = new PageInfo(voList);
+            for (PerformanceAdminListDao item:voList){
+                item.setStatus(item.getStatus());
+                newList.add(item);
+            }
+            pageInfoTmp = new PageInfo(newList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java

@@ -9,8 +9,10 @@ public class PerformanceAdminListDao {
     private String performancesId;
     private String title;
     private String timeStart;
+    private String timeEnd;
     private String sponsor;
     private Integer status;
+    private String statusName;
     private String auditTime;
     private Integer auditStatus;
     private Integer totalGeneral;
@@ -18,6 +20,33 @@ public class PerformanceAdminListDao {
     private Integer totalSalePrice;
     private Integer surplusGeneral;
     private String rejectTxt;
+    private Integer sort;
     private String createdAt;
 
+    public void setStatus(Integer status){
+        this.status=status;
+        switch (status){
+            case 1:
+                this.statusName="审核中";
+                break;
+            case 3:
+                this.statusName="审核通过";
+                break;
+            case 4:
+                this.statusName="审核拒绝";
+                break;
+            case 6:
+                this.statusName="售卖中";
+                break;
+            case 7:
+                this.statusName="已下架";
+                break;
+            case 8:
+                this.statusName="演出结束";
+                break;
+            default:
+                this.statusName="其他";
+                break;
+        }
+    }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -13,6 +13,7 @@
         <result column="surplus_general" property="surplusGeneral"/>
         <result column="status" property="status"/>
         <result column="type" property="type"/>
+        <result column="sort" property="sort"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="reject_txt" property="rejectTxt"/>
         <result column="created_at" property="createdAt"/>
@@ -21,7 +22,6 @@
     <resultMap id="misPerformanceListResult" type="com.liquidnet.service.kylin.dao.PerformanceAdminListDao">
         <result column="performances_id" property="performancesId"/>
         <result column="title" property="title"/>
-        <result column="type" property="type"/>
         <result column="time_start" property="timeStart"/>
         <result column="time_end" property="timeEnd"/>
         <result column="total_general" property="totalGeneral"/>
@@ -142,7 +142,7 @@
         ORDER BY #{orderItem} #{orderSc}
     </select>
     <!-- Mis演出列表 (不包含退票信息) -->
-    <select id="misPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
+    <select id="misPerformanceList" parameterType="java.util.Map" resultMap="misPerformanceListResult">
         SELECT
         p.performances_id ,
         p.sponsor,
@@ -210,9 +210,9 @@
             <if test="auditStatus!='-2'">
                 AND ps.audit_status = #{auditStatus}
             </if>
-            <if test="auditStatus=='-2'">
-                AND (ps.audit_status = 0 or ps.audit_status = 2)
-            </if>
+<!--            <if test="auditStatus=='-2'">-->
+<!--                AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
+<!--            </if>-->
             <if test="stopSellDay!=-2">
                 AND p.time_end BETWEEN #{stopSellTime} AND NOW()
             </if>