数据大屏

performance-api/src/main/java/com/clx/performance/param/pc/PageAppPrepaidFreightAccountParam.java

@@ -20,9 +20,12 @@ public class PageAppPrepaidFreightAccountParam extends PageParam {
     @ApiModelProperty(value="货主编码",example = "20145787812312312")
     private Long ownerUserNo;
 
-    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "10")
+    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "1")
     private Integer queryWaterType;
 
+    @ApiModelProperty(value="1: 保证金 2：预付运费",example = "1")
+    private Integer accountType;
+
     @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
     private String beginTime;
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -110,6 +110,15 @@ public class OwnerRunningWaterRecordSqlProvider {
                             );
                 }
             }
+            if (ObjectUtil.isNotNull(param.getAccountType())) {
+                if (OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode().equals(param.getAccountType())) {
+                    WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode());
+
+                }else if (OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode().equals(param.getAccountType())) {
+                    WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+
+                }
+            }
 
             ORDER_BY("a.create_time desc");
         }}.toString();