|
@@ -35,14 +35,15 @@
|
|
|
SUM(t.fluid_prod_mon) fluid,
|
|
|
0 watercut
|
|
|
FROM ( SELECT wm.well_id,
|
|
|
- wm.prod_date prod_time_str,
|
|
|
+ to_char(to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d'), 'YYYY年MM月') prod_time_str,
|
|
|
COALESCE(wm.gas_prod_mon, 0) gas_prod_mon,
|
|
|
COALESCE(wm.oil_prod_mon, 0) oil_prod_mon,
|
|
|
COALESCE(wm.water_prod_mon, 0) water_prod_mon,
|
|
|
COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
|
|
|
FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
|
|
|
- WHERE wm.prod_date <![CDATA[ >= ]]> #{startDay}
|
|
|
- and wm.prod_date <![CDATA[ <= ]]> #{endDay}
|
|
|
+ WHERE wm.prod_date is not null
|
|
|
+ and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d') <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
|
|
|
+ and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d') <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
|
|
|
<if test="wellId!='' and wellId!=null">
|
|
|
and wm.well_id=#{wellId}
|
|
|
</if>
|
|
@@ -59,14 +60,15 @@
|
|
|
SUM(t.fluid_prod_mon) fluid,
|
|
|
0 watercut
|
|
|
FROM ( SELECT wm.well_id,
|
|
|
- LEFT(prod_date,4 ) prod_time_str,
|
|
|
+ SUBSTRING(prod_date, 1, 4) prod_time_str,
|
|
|
COALESCE(wm.gas_prod_mon, 0) gas_prod_mon,
|
|
|
COALESCE(wm.oil_prod_mon, 0) oil_prod_mon,
|
|
|
COALESCE(wm.water_prod_mon, 0) water_prod_mon,
|
|
|
COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
|
|
|
FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
|
|
|
- WHERE wm.prod_time <![CDATA[ >= ]]> #{startDay}
|
|
|
- and wm.prod_time <![CDATA[ <= ]]> #{endDay}
|
|
|
+ WHERE wm.prod_date is not null
|
|
|
+ and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d') <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
|
|
|
+ and to_date(CONCAT(wm.prod_date,'-01'), '%Y-%m-%d') <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
|
|
|
<if test="wellId!='' and wellId!=null">
|
|
|
and wm.well_id=#{wellId}
|
|
|
</if>
|