实收返回年月和状态

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

@@ -20,6 +20,10 @@ import java.util.Date;
 @ApiModel(value = "缴费界面————欠费信息")
 public class PayfeeReceivableInfo {
 
+    @ApiModelProperty(value = "客户编码" )
+    private String accountnumber;
+    @ApiModelProperty(value = "客户名称" )
+    private String accountname;
     @ApiModelProperty(value = "客户id")
     private BigInteger accountId ;
     @ApiModelProperty(value = "账期年")

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

@@ -12,6 +12,14 @@ import lombok.Data;
 @Data
 @ApiModel(value = "缴费界面——实收信息")
 public class PayfeeReceivedInfo {
+    @ApiModelProperty(value = "客户编码" )
+    private String accountnumber;
+    @ApiModelProperty(value = "客户名称" )
+    private String accountname;
+    @ApiModelProperty(value = "账期年")
+    private Integer year ;
+    @ApiModelProperty(value = "账期月")
+    private Integer month;
     @ApiModelProperty(value = "收费项目")
     private String name;
     @ApiModelProperty(value = "水价阶梯")

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

@@ -241,10 +241,13 @@
        select
             accountnumber,
             accountname,
+            `year`,`month`,
              CONCAT(year,'年',LPAD(month, 2, 0),'月费用') as "name" ,
              '--'as "ladderlevelname",
              payseriesno as "payseriesno",
              sum(receivedamount) as "receivedamount",
+              (case when  min(reced.payway) != 5 then min(reced.payway) else max(reced.payway) end ) as "payway",
+              max(reced.state) as "state",
              (select label from pay_sys_dict where type = '支付方式' and value =
                 (case when  min(reced.payway) != 5 then min(reced.payway) else max(reced.payway) end )
                  and site_id = #{siteId} and customer_id =#{customerId}) as "paywayname",