|
|
@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springblade.common.aop.core.TenantAop;
|
|
|
import org.springblade.common.constant.Salesman;
|
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
@@ -76,12 +77,18 @@ public class WithdrawRecController extends BladeController {
|
|
|
@ApiOperationSupport(order = 2)
|
|
|
@ApiOperation(value = "分页", notes = "传入withdrawRec")
|
|
|
@TenantAop(salesman=Salesman.roleName)
|
|
|
- public R<IPage<WithdrawRecVO>> list(WithdrawRec withdrawRec, Query query, Date createTimeStart, Date createTimeEnd) {
|
|
|
+ public R<IPage<WithdrawRecVO>> list(WithdrawRec withdrawRec, Query query, Date createTimeStart, Date createTimeEnd,String key) {
|
|
|
QueryWrapper<WithdrawRec> queryWrapper = Condition.getQueryWrapper(withdrawRec);
|
|
|
//添加创建时间条件
|
|
|
if(createTimeStart!=null && createTimeEnd!=null){
|
|
|
queryWrapper.lambda().between(WithdrawRec::getCreateTime,createTimeStart,createTimeEnd);
|
|
|
}
|
|
|
+ //添加关键字key查询条件
|
|
|
+ if(StringUtils.isNotBlank(key)){
|
|
|
+ queryWrapper.lambda().and(wq->{
|
|
|
+ wq.eq(WithdrawRec::getReceiverAccountName,key);
|
|
|
+ });
|
|
|
+ }
|
|
|
queryWrapper.lambda().orderByDesc(WithdrawRec::getCreateTime);
|
|
|
return R.data(WithdrawRecWrapper.build(userService,shopService).pageVO(withdrawRecService.page(Condition.getPage(query), queryWrapper)));
|
|
|
}
|