|
@@ -222,11 +222,13 @@
|
|
|
<select id="getNoOpenAmountCountByDay" resultType="java.lang.Integer">
|
|
|
select count(1) as num
|
|
|
from sc_device scd
|
|
|
+ left join pay_base_account pba on pba.id = scd.account_id
|
|
|
left join pay_amount_waterusedamount_day amount on amount.watermeter_id = scd.id
|
|
|
and amount.read_date =DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day) ,'%Y%m%d')
|
|
|
- where scd.status =1 and amount.id is null
|
|
|
+ left join pay_base_customerandmeterrela rela on rela.id= amount.customerandmeterrela_id
|
|
|
+ where scd.status =1 and amount.id is null and (rela.id is null or rela.businessstate=2)
|
|
|
<if test="customerId!= null" >and scd.customer_id = #{customerId} </if>
|
|
|
- <if test="siteId!= null" > and scd.site_id = #{siteId} </if>
|
|
|
+ <if test="siteId!= null" > and pba.site_id = #{siteId} </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="getAllAmountRecord" resultType="com.bz.smart_city.dto.pay.AmountWaterUsedAmountDto">
|
|
@@ -444,18 +446,20 @@
|
|
|
now(),
|
|
|
'每天抄表计划',
|
|
|
0,
|
|
|
- NULL,
|
|
|
+ pba.site_id,
|
|
|
c.customer_id,
|
|
|
DATE_FORMAT( DATE_SUB( now(), INTERVAL 1 DAY ), '%Y%m%d' ),
|
|
|
NULL
|
|
|
FROM
|
|
|
sc_device c
|
|
|
+ left join pay_base_account pba on pba.id = c.account_id
|
|
|
LEFT JOIN pay_amount_waterusedamount_day amount ON amount.watermeter_id = c.id
|
|
|
AND amount.read_date = DATE_FORMAT( DATE_SUB( now(), INTERVAL 1 DAY ), '%Y%m%d' )
|
|
|
+ left join pay_base_customerandmeterrela rela on rela.id= amount.customerandmeterrela_id
|
|
|
WHERE
|
|
|
- amount.id IS NULL
|
|
|
+ c.status =1 and amount.id IS NULL and (rela.id is null or rela.businessstate=2)
|
|
|
<if test="customerId!= null" >AND c.customer_id = #{customerId}</if>
|
|
|
- <if test="siteId!= null" > and c.site_id = #{siteId} </if>
|
|
|
+ <if test="siteId!= null" > and pba.site_id = #{siteId} </if>
|
|
|
limit 500
|
|
|
</insert>
|
|
|
|
|
@@ -549,7 +553,7 @@
|
|
|
from pay_amount_waterusedamount_day amount
|
|
|
left join pay_base_customerandmeterrela rela on rela.id= amount.customerandmeterrela_id
|
|
|
where amount.read_date =DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day) ,'%Y%m%d')
|
|
|
- and rela.id is null
|
|
|
+ and (rela.id is null or rela.businessstate=2)
|
|
|
<if test="customerId!= null" > and amount.customer_id =#{customerId}</if>
|
|
|
<if test="siteId!= null" > and amount.site_id = #{siteId} </if>
|
|
|
</select>
|
|
@@ -567,12 +571,13 @@
|
|
|
<select id="getNoOpenWaterMeterIdByDay" resultType="java.math.BigInteger">
|
|
|
select scd.id
|
|
|
from sc_device scd
|
|
|
+ left join pay_base_account pbac on pbac.id = scd.account_id
|
|
|
left join pay_amount_waterusedamount_day amount on amount.watermeter_id = scd.id
|
|
|
and amount.read_date =DATE_FORMAT(DATE_SUB(now(),INTERVAL 1 day) ,'%Y%m%d')
|
|
|
left join pay_base_customerandmeterrela pba on pba.watermeter_id = scd.id
|
|
|
where scd.status =1 and amount.reading is null and (pba.id is null or pba.businessstate=2)
|
|
|
<if test="customerId!= null" >and scd.customer_id = #{customerId} </if>
|
|
|
- <if test="siteId!= null" > and scd.site_id = #{siteId} </if>
|
|
|
+ <if test="siteId!= null" > and pbac.site_id = #{siteId} </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="getCustIdAndSiteId" resultType="com.bz.smart_city.entity.pay.archives.PayBaseCustomerandmeterrela">
|
|
@@ -585,12 +590,12 @@
|
|
|
group by c.customer_id, c.site_id
|
|
|
</select>
|
|
|
|
|
|
- <select id="getCustIdAndSiteIdByDevice" resultType="com.bz.smart_city.entity.pay.archives.PayBaseCustomerandmeterrela">
|
|
|
+ <select id="getCustIdAndSiteIdByAccount" resultType="com.bz.smart_city.entity.pay.archives.PayBaseCustomerandmeterrela">
|
|
|
select
|
|
|
c.customer_id customerId,
|
|
|
c.site_id siteId
|
|
|
- from sc_device c
|
|
|
- where c.status =1
|
|
|
+ from pay_base_account c
|
|
|
+ where c.del_flag=0
|
|
|
and c.customer_id is not null and c.site_id is not null
|
|
|
group by c.customer_id, c.site_id
|
|
|
</select>
|