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

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

统计增加 use_end

parent 2aae3e85
......@@ -26,6 +26,8 @@ public class PerformanceOrderStatisticalVo {
private Integer type;
@ApiModelProperty(value = "适用时间")
private String useStart;
@ApiModelProperty(value = "适用时间")
private String useEnd;
@ApiModelProperty(value = "总库存")
private BigDecimal totalGeneral = BigDecimal.ZERO;
@ApiModelProperty(value = "销售数量")
......
......@@ -85,6 +85,7 @@
<result column="price" property="price"/>
<result column="type" property="type"/>
<result column="use_start" property="useStart"/>
<result column="use_end" property="useEnd"/>
<result column="total_general" property="totalGeneral"/>
<result column="sale_general" property="saleGeneral"/>
<result column="surplus_general" property="surplusGeneral"/>
......@@ -394,6 +395,7 @@
kt.price,
kt.type,
kt.use_start,
kt.use_end,
IFNULL(kts.total_general , 0) AS 'total_general' ,
IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0) - IFNULL(otp.total_paying_number , 0)),0) AS 'surplus_general',
......
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