结算方式

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -47,6 +47,8 @@ public class OrderPagingResult {
      */
     private String sn;
     private String projectName;
+    private String settlementWay;
+    private String settlementWayTxt;
     private LocalDateTime checkTime;
     private LocalDateTime transTime;
     private LocalDateTime assignmentTransTime;

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -5,6 +5,13 @@
 
     <sql id="base_select">
         SELECT a.id,
+               g.settlement_way,
+               CASE g.settlement_way
+                   WHEN 'month' THEN '月结'
+                   WHEN 'balance' THEN '余额抵扣'
+                   WHEN 'cash' THEN '现付'
+                   ELSE ''
+                   END              settlement_way_txt,
                a.sn,
                a.station_id,
                a.certificate_sn,