1优化客户、开户、缴费sql语句

smart-city-platform/src/main/resources/mapper/PayBaseCustomerandmeterrelaMapper.xml

@@ -253,27 +253,27 @@
             account.email,
             customer.vatno,
             customer.businessstate as "businessstate",
-            (select label from pay_sys_dict where type = '开户状态' and value = customer.businessstate and site_id = #{siteId} and customer_id =#{customerId}) as "businessName",
+            (select label from pay_sys_dict where type = '开户状态' and value = customer.businessstate and customer_id =#{customerId} and site_id = #{siteId}) as "businessName",
             customer.calculateway as "calculateway",
-            (select label from pay_sys_dict where type = '结算方式' and value = customer.calculateway and site_id = #{siteId} and customer_id =#{customerId}) as "calculatewayName",
+            (select label from pay_sys_dict where type = '结算方式' and value = customer.calculateway and customer_id =#{customerId} and site_id = #{siteId}) as "calculatewayName",
             account.idtype as "idtype",
-            (select label from pay_sys_dict where type = '证件类型' and value = account.idtype and site_id = #{siteId} and customer_id =#{customerId}) as "idtypeName",
+            (select label from pay_sys_dict where type = '证件类型' and value = account.idtype and customer_id =#{customerId}  and site_id = #{siteId}) as "idtypeName",
             account.idcardno as "idcardno",
             customer.housetype as "housetype",
-            (select label from pay_sys_dict where type = '住房类型' and value = customer.housetype and site_id = #{siteId} and customer_id =#{customerId}) as "housetypeName",
+            (select label from pay_sys_dict where type = '住房类型' and value = customer.housetype and customer_id =#{customerId} and site_id = #{siteId}) as "housetypeName",
             customer.customergroup as "customergroup",
-            (select label from pay_sys_dict where type = '开户分组' and value = customer.customergroup and site_id = #{siteId} and customer_id =#{customerId}) as "customergroupName"
+            (select label from pay_sys_dict where type = '开户分组' and value = customer.customergroup and customer_id =#{customerId} and site_id = #{siteId}) as "customergroupName"
         from pay_base_customerandmeterrela customer
         left join sc_device device on customer.watermeter_id = device.id
         left join pay_base_account account on account.id = customer.account_id
         left join pay_base_waterproperty property on property.id = customer.waterproperty_id
         <where>
-            <if test="siteId != null">
-                and  customer.site_id = #{siteId}
-            </if>
             <if test="customerId != null">
                 and customer.customer_id = #{customerId}
             </if>
+            <if test="siteId != null">
+                and  customer.site_id = #{siteId}
+            </if>
             <if test="condition != null">
                 and
                 (

smart-city-platform/src/main/resources/mapper/pay/PayBaseAccountMapper.xml

@@ -273,10 +273,10 @@
         IFNULL(cust.waterNumber,0) AS waterNumber,
         IFNULL(paw.sum_payamount,0) sumPayamount,
         pba.state as state,
-        (select label from pay_sys_dict where value = pba.state and type='客户状态' and site_id = #{siteId} and customer_id = #{customerId}) stateName,
+        (select label from pay_sys_dict where value = pba.state and type='客户状态' and customer_id = #{customerId} and site_id = #{siteId}) stateName,
 
         dt.remaining ,
-        (select label from pay_sys_dict where value = pba.idtype and type='证件类型' and site_id = #{siteId} and customer_id = #{customerId}) idTypeName,
+        (select label from pay_sys_dict where value = pba.idtype and type='证件类型' and customer_id = #{customerId} and site_id = #{siteId}) idTypeName,
         pba.accountnumber,
         pba.name,
         pba.telephone,
@@ -288,7 +288,7 @@
             account_id,
             ifnull(sum(payamount),0) sum_payamount
             from pay_amount_waterusedamount
-            where  site_id = #{siteId} and customer_id = #{customerId}  and year=#{year} and month=#{month}
+            where  customer_id = #{customerId}  and site_id = #{siteId} and year=#{year} and month=#{month}
             group by account_id
         ) paw on paw.account_id = pba.id
         left join (
@@ -421,9 +421,9 @@
             pba.email,
             pbc.vatno
         from pay_base_account pba
-        left join pay_sys_dict psd on pba.idtype=psd.`value` and psd.type='证件类型' and psd.site_id=#{siteId} and psd.customer_id=#{customerId}
+        left join pay_sys_dict psd on pba.idtype=psd.`value` and psd.type='证件类型' and psd.customer_id=#{customerId} and psd.site_id=#{siteId}
         left join pay_pay_rechargeaccount ppr on pba.accountnumber=ppr.accountnumber and ppr.site_id=#{siteId} and ppr.customer_id=#{customerId}
-        left join pay_sys_dict psd2 on pba.state = psd2.`value` and psd2.type='客户状态' and psd2.site_id=#{siteId} and psd2.customer_id=#{customerId}
+        left join pay_sys_dict psd2 on pba.state = psd2.`value` and psd2.type='客户状态' and psd2.customer_id=#{customerId} and psd2.site_id=#{siteId}
         left join pay_base_customerandmeterrela pbc on pbc.account_id = pba.id
         where pba.accountnumber = #{queryInfo} and pba.site_id=#{siteId} and pba.customer_id=#{customerId}
 

smart-city-platform/src/main/resources/mapper/pay/payFeeMapper.xml

@@ -106,19 +106,19 @@
             c.opendate,
             c.metercode,
             c.watermeter_id as "watermeterId",
-            (select label from pay_sys_dict where type='住房类型' and `value`=c.housetype and site_id=#{siteId}
-            and customer_id=#{customerId}) as "housetype",
-            (select label from pay_sys_dict where type='结算方式' and `value`=c.calculateway and  site_id=#{siteId}
-            and customer_id=#{customerId}) as "calculateway",
+            (select label from pay_sys_dict where type='住房类型' and `value`=c.housetype and customer_id=#{customerId}
+            and site_id=#{siteId} ) as "housetype",
+            (select label from pay_sys_dict where type='结算方式' and `value`=c.calculateway and  customer_id=#{customerId}
+            and  site_id=#{siteId}) as "calculateway",
             p.id as "waterPropertyId",
             p.name as "waterPropertyName",
             device.water_meter_no as "metereleno"
         from pay_base_customerandmeterrela c
         left join pay_base_account a on c.account_id=a.id
         left join pay_base_waterproperty p on c.waterProperty_id=p.id
-        inner join sc_device device on device.metercode = c.metercode and device.customer_id =#{customerId}
+        inner join sc_device device on device.id = c.watermeter_id and device.customer_id =#{customerId}
         <where>
-            c.businessstate=1 and c.site_id=#{siteId}
+            c.businessstate=1 and c.customer_id =#{customerId} and c.site_id=#{siteId}
             <if test="id != null and id != ''">
                and  c.id= #{id}
             </if>