实收信息修改

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PayfeeReceivedInfo.java

@@ -14,6 +14,8 @@ import lombok.Data;
 public class PayfeeReceivedInfo {
     @ApiModelProperty(value = "客户编码" )
     private String accountnumber;
+    @ApiModelProperty(value = "客户id" )
+    private String accountId;
     @ApiModelProperty(value = "客户名称" )
     private String accountname;
     @ApiModelProperty(value = "账期年")

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

@@ -222,8 +222,8 @@
                     else '' end) as "ladderlevelname",
          payseriesno as "payseriesno",
          receivedamount,
-         max(rece.state) as "state",
-         min(rece.payway) as "payway",
+         reced.state as "state",
+         reced.payway as "payway",
          (select label from pay_sys_dict where type = '支付方式' and value = reced.payway and site_id = #{siteId} and customer_id =#{customerId}) as "paywayname",
          (select label from pay_sys_dict where type = '交易状态' and value = reced.state and site_id = #{siteId} and customer_id =#{customerId}) as "statename",
          create_date as "createDate",
@@ -239,6 +239,7 @@
 
     <select id="getPayreceived" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivedInfo">
        select
+            account_id as "accountId",
             accountnumber,
             accountname,
             `year`,`month`,
@@ -258,7 +259,7 @@
         where
          account_id=#{accountId}
         and `year`=#{year}
-        group by accountnumber,accountname,`year`,`month`,payseriesno
+        group by account_id,accountnumber,accountname,`year`,`month`,payseriesno
     </select>
     <select id="getWaterusedamount" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeWaterusedamount">
         select