提现增加操作时间筛选

src/main/java/com/sqx/modules/pay/controller/query/CashOutQueryDTO.java

@@ -41,6 +41,10 @@ public class CashOutQueryDTO extends PageQuery {
 
     @ApiModelProperty("骑手所在站点id")
     private String riderStationId;
+    @ApiModelProperty("操作开始时间")
+    private String outStartTime;
+    @ApiModelProperty("操作结束时间")
+    private String outEndTime;
 
     public String toStrCode() {
         return
@@ -57,7 +61,9 @@ public class CashOutQueryDTO extends PageQuery {
 //                ","+classify+
                 ","+(startTime==null?"":startTime)+
                 ","+(endTime==null?"":endTime)+
-                ","+(riderStationId==null?"":riderStationId)+",";
+                ","+(riderStationId==null?"":riderStationId)+
+                ","+(outStartTime==null?"":outStartTime)+
+                ","+(outEndTime==null?"":outEndTime)+",";
     }
     public String toStrMessage() {
         StringBuffer stringBuffer=new StringBuffer();
@@ -72,7 +78,9 @@ public class CashOutQueryDTO extends PageQuery {
 //                .append(phone==null||phone==""?"":"用户手机号："+phone+";")
 //                .append(classify==null?"":"支付渠道："+classify+";")
                 .append(startTime==null||startTime==""?"":"开始时间："+startTime+";")
-                .append(endTime==null||endTime==""?"":"结束时间："+endTime+";");
+                .append(endTime==null||endTime==""?"":"结束时间："+endTime+";")
+                .append(outStartTime==null||outStartTime==""?"":"操作开始时间："+outStartTime+";")
+                .append(outEndTime==null||outEndTime==""?"":"操作结束时间："+outEndTime+";");
         if(state!=null){
             switch (state){
                 case 0: stringBuffer.append("状态：待转账;");break;

src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -253,6 +253,8 @@ public class ExportScheduler {
         queryDTO.setStartTime(conditions[6]);
         queryDTO.setEndTime(conditions[7]);
         queryDTO.setRiderStationId(conditions[8]);
+        queryDTO.setOutStartTime(conditions[9]);
+        queryDTO.setOutEndTime(conditions[10]);
         return cashOutService.excelPayDetails(queryDTO);
     }
 

src/main/resources/mapper/pay/CashDao.xml

@@ -279,6 +279,12 @@
             <if test="params.endTime != null and params.endTime != '' and params.endTime != 'null'">
                 and co.create_at <![CDATA[ <= ]]> #{params.endTime}
             </if>
+            <if test="params.outStartTime != null and params.outStartTime != '' and params.outStartTime != 'null'">
+                and co.out_at <![CDATA[ >= ]]> #{params.outStartTime}
+            </if>
+            <if test="params.outEndTime != null and params.outEndTime != '' and params.outEndTime != 'null'">
+                and co.out_at <![CDATA[ <= ]]> #{params.outEndTime}
+            </if>
             <if test="params.shopName != null and params.shopName != '' and params.shopName != 'null'">
                 and gh.shop_name like concat('%',#{params.shopName},'%')
             </if>