记得上下班打卡 | git大法好,push需谨慎

Commit 7b93ba3b authored by 胡佳晨's avatar 胡佳晨

修改 admin 演出列表增加退票张数

parent 8ff0b231
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
field: 'saleGeneral', field: 'saleGeneral',
title: '实销' title: '实销'
}, },
{
field: 'refundNumber',
title: '退票'
},
{ {
field: 'surplusGeneral', field: 'surplusGeneral',
title: '余票' title: '余票'
......
...@@ -22,6 +22,7 @@ public class PerformanceAdminListDao { ...@@ -22,6 +22,7 @@ public class PerformanceAdminListDao {
private Integer auditStatus; private Integer auditStatus;
private Integer totalGeneral; private Integer totalGeneral;
private Integer saleGeneral; private Integer saleGeneral;
private Integer refundNumber;
private BigDecimal totalSalePrice; private BigDecimal totalSalePrice;
private Integer surplusGeneral; private Integer surplusGeneral;
private Integer syncDamai; private Integer syncDamai;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result column="time_end" property="timeEnd"/> <result column="time_end" property="timeEnd"/>
<result column="total_general" property="totalGeneral"/> <result column="total_general" property="totalGeneral"/>
<result column="sale_general" property="saleGeneral"/> <result column="sale_general" property="saleGeneral"/>
<result column="refund_number" property="refundNumber"/>
<result column="total_sale_price" property="totalSalePrice"/> <result column="total_sale_price" property="totalSalePrice"/>
<result column="surplus_general" property="surplusGeneral"/> <result column="surplus_general" property="surplusGeneral"/>
<result column="status" property="status"/> <result column="status" property="status"/>
...@@ -298,6 +299,7 @@ ...@@ -298,6 +299,7 @@
t.time_stop, t.time_stop,
IFNULL(t.total_general , 0) AS 'total_general' , IFNULL(t.total_general , 0) AS 'total_general' ,
IFNULL(ot.sale_general , 0) AS 'sale_general' , IFNULL(ot.sale_general , 0) AS 'sale_general' ,
IFNULL(ot.refund_number , 0) AS 'refund_number' ,
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' , IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
IFNULL( IFNULL(
( (
...@@ -335,6 +337,7 @@ ...@@ -335,6 +337,7 @@
) AS t ON p.performances_id = t.performance_id ) AS t ON p.performances_id = t.performance_id
LEFT JOIN( LEFT JOIN(
SELECT SELECT
sum(ot.refund_number) AS 'refund_number',
(sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' , (sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' ,
(sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' , (sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' ,
otr.performance_id AS 'performance_id' otr.performance_id AS 'performance_id'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment