第三方支付

src/main/java/com/poteviohealth/ym/ipos/model/split/dto/SplitWithdrawDto.java

@@ -4,8 +4,6 @@ import com.poteviohealth.cgp.common.model.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 取现查询
  * @author Qin
@@ -20,8 +18,8 @@ public class SplitWithdrawDto extends PageQuery {
     private String acctStatus;
 
     @ApiModelProperty(value = "取现日期")
-    private Date transDateStart;
+    private String transDateStart;
 
     @ApiModelProperty(value = "取现日期")
-    private Date transDateEnd;
+    private String transDateEnd;
 }

src/main/java/com/poteviohealth/ym/ipos/service/impl/SplitWithdrawServiceImpl.java

@@ -26,8 +26,8 @@ public class SplitWithdrawServiceImpl extends ServiceImpl<SplitWithdrawMapper, S
         QueryWrapper<SplitWithdraw> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotEmpty(dto.getTransStatus()),"trans_status", dto.getTransStatus());
         wrapper.eq(StringUtils.isNotEmpty(dto.getAcctStatus()),"acct_status", dto.getAcctStatus());
-        wrapper.ge(dto.getTransDateStart() != null, "trans_date",dto.getTransDateStart());
-        wrapper.le(dto.getTransDateEnd() != null, "trans_date",dto.getTransDateEnd());
+        wrapper.ge(StringUtils.isNotEmpty(dto.getTransDateStart()), "trans_date",dto.getTransDateStart());
+        wrapper.le(StringUtils.isNotEmpty(dto.getTransDateEnd()), "trans_date",dto.getTransDateEnd());
         Page<SplitWithdraw> result = this.page(page,wrapper);
         CommonPage<SplitWithdraw> ret = MyBatisConvertUtils.convert2CommonPage(result);
         ret.setRecords(result.getRecords());