票据bug修改

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayFeeMapper.java

@@ -50,5 +50,5 @@ public interface PayFeeMapper {
 
     List<PayfeeWaterusedamount> getWaterusedamount(@Param("accountId")BigInteger accountId , @Param("year")Integer year , @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
 
-    List<PayInvoiceDto> getPayinvoiceInfo(@Param("accountId")BigInteger accountId , @Param("year")Integer year);
+    List<PayInvoiceDto> getPayinvoiceInfo(@Param("accountId")BigInteger accountId , @Param("year")Integer year, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayFeeServiceImp.java

@@ -840,7 +840,8 @@ public class PayFeeServiceImp implements PayFeeService {
      * @return
      */
     public List<PayInvoiceDto> getPayinvoiceInfo(BigInteger accountId, Integer year) {
-        return payFeeMapper.getPayinvoiceInfo(accountId, year);
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        return payFeeMapper.getPayinvoiceInfo(accountId, year,  loginUser.getSiteId(), loginUser.getCustomerId());
     }
 
 }

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

@@ -59,7 +59,8 @@
         a.accountname as "accountname",
         a.invoiceamount as "invoiceamount",
         a.state as "state",
-        (case when a.state=2 then '已使用' else '作废' end ) as "stateLabel",
+        (select label from pay_sys_dict where type = '票据状态' and value = a.state and site_id = a.site_id and customer_id = a.customer_id) stateLabel,
+
         a.create_date as "createDate",
         (select name from sc_user where id=a.create_by) as "createByName",
         a.canceltime as "canceltime",
@@ -75,7 +76,7 @@
         a.accountname as "accountname",
         a.invoiceamount as "invoiceamount",
         a.state as "state",
-        (case when a.state=2 then '已使用' else '作废' end ) as "stateLabel",
+        (select label from pay_sys_dict where type = '票据状态' and value = a.state and site_id = #{siteId} and customer_id = #{customerId}) stateLabel,
         a.create_date as "createDate",
         (select name from sc_user where id=a.create_by) as "createByName",
         a.canceltime as "canceltime",

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

@@ -291,7 +291,7 @@
         a.accountname as "accountname",
         a.invoiceamount as "invoiceamount",
         a.state as "state",
-        (case when a.state=2 then '已使用' else '作废' end ) as "stateLabel",
+        (select label from pay_sys_dict where type = '票据状态' and value = a.state and site_id = #{siteId} and customer_id = #{customerId}) stateLabel,
         a.create_date as "createDate",
         (select name from sc_user where id=a.create_by) as "createByName",
         a.canceltime as "canceltime",