增加字段 isprint

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

@@ -51,6 +51,8 @@ public class PayPayReceivedListDto extends BaseDto {
     private String watertypename;
     @ApiModelProperty(example = "1",notes = "交易状态")
     private Integer state;
+    @ApiModelProperty(example = "1",notes = "是否开发票：0否 1是")
+    private Integer isprint;
     @ApiModelProperty(example = "2020",notes = "账期年")
     private Integer year;
     @ApiModelProperty(example = "1",notes = "账期月")

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

@@ -77,6 +77,8 @@ public class PayTransactiondetailsDto{
 
     @ApiModelProperty("站点id")
     private Integer siteId;
+    @ApiModelProperty("是否打印发票：1是 0否")
+    private Integer isprint;
 
     @ApiModelProperty("客户id")
     private Integer customerId;

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

@@ -56,5 +56,7 @@ public class PayfeeReceivedInfo {
     private String cancelperson;
     @ApiModelProperty(value = "收据id")
     private BigInteger invoiceId;
+    @ApiModelProperty(value = "是否打印发票：0否 1是")
+    private Integer isprint;
 
 }

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

@@ -85,6 +85,7 @@
             max(rece.invoice_id) as "invoiceId",
             max(canceltime) as "canceltime",
             (select name from sc_user where id= max(rece.cancelperson)) as "cancelperson",
+            ifnull(rece.isprint,0) as "isprint",
             rece.year as "year",
             rece.month as "month"
         from pay_pay_received rece

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

@@ -309,6 +309,7 @@
             ,t.transamount
             ,t.payway
             ,t.invoiceId
+            ,ifnull(t.isprint,0) as "isprint"
             ,dict.label as"paywayLabel"
             ,t.transtype
             ,t.transtypeLabel
@@ -339,6 +340,7 @@
                 ,min(payway) payway
                 ,max(transtype) transtype
                 ,max(invoiceId) as "invoiceId"
+                ,max(isprint) as "isprint"
                 ,case when max(transtype) = 1 then '充值'
                         else (case when  min(payway) = 5 then '扣费' else '缴费' end ) end transtypeLabel
             from (
@@ -352,6 +354,7 @@
             ,max(canceltime) canceltime
             ,max(cancelperson) cancelperson
             ,max(invoice_id) as "invoiceId"
+            ,0 as "isprint"
             from pay_pay_transactiondetails
             where canceledrecord_id is null and payway !=5 and transtype!=2
                 and site_id=#{siteId} and customer_id = #{customerId}
@@ -390,6 +393,7 @@
             ,max(canceltime) canceltime
             ,max(cancelperson) cancelperson
             ,max(invoice_id) as "invoiceId"
+            ,max(isprint) as "isprint"
             from pay_pay_received
             where canceledrecord_id is null and payway !=5
                 and site_id=#{siteId} and customer_id = #{customerId}
@@ -458,6 +462,7 @@
         ,ab.type as "payway"
         ,dict.label as"paywayLabel"
         ,ifnull(r.invoiceId,t.invoiceId) invoiceId
+        ,ifnull(r.isprint,0) isprint
         ,ifnull(r.iscanceled,t.iscanceled) iscanceled
         ,ifnull(r.canceltime,t.canceltime) canceltime
         ,ifnull(r.cancelperson,t.cancelperson) cancelperson
@@ -489,6 +494,7 @@
                                 office_id,payseriesno
                                 ,0 as  transtype
                                 ,'缴费'  transtypeLabel
+                                ,max(isprint) isprint
                                 ,min(payway) payway
                                 ,max(invoice_id) as "invoiceId"
                                 ,max(iscanceled) iscanceled

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

@@ -259,7 +259,8 @@
             (select name from sc_user where id= max(reced.cancelperson)) as "cancelperson",
             max(canceltime) as "canceltime",
             max(create_date) as "createDate",
-            max(canceledrecord_id) as "canceledrecordId"
+            max(canceledrecord_id) as "canceledrecordId",
+            ifnull(max(isprint),0) as "isprint"
         from pay_pay_received reced
         where
          account_id=#{accountId}