字符串判空
This commit is contained in:
parent
b16237467d
commit
fde003728b
|
|
@ -1,5 +1,6 @@
|
||||||
package com.czg;
|
package com.czg;
|
||||||
|
|
||||||
|
import com.czg.utils.CzgStrUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -14,7 +15,14 @@ public class TimeQueryParam extends BaseQueryParam {
|
||||||
private String startTime;
|
private String startTime;
|
||||||
/**
|
/**
|
||||||
* 结束时间 yyyy-MM-dd HH:mm:ss
|
* 结束时间 yyyy-MM-dd HH:mm:ss
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private String endTime;
|
private String endTime;
|
||||||
|
|
||||||
|
public String getStartTime() {
|
||||||
|
return CzgStrUtils.getStrOrNull(startTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getEndTime() {
|
||||||
|
return CzgStrUtils.getStrOrNull(endTime);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import com.czg.market.dto.SmsShopMoneyDetailDTO;
|
||||||
import com.czg.market.entity.SmsShopMoneyDetail;
|
import com.czg.market.entity.SmsShopMoneyDetail;
|
||||||
import com.czg.market.service.SmsShopMoneyDetailService;
|
import com.czg.market.service.SmsShopMoneyDetailService;
|
||||||
import com.czg.service.market.mapper.SmsShopMoneyDetailMapper;
|
import com.czg.service.market.mapper.SmsShopMoneyDetailMapper;
|
||||||
|
import com.czg.utils.CzgStrUtils;
|
||||||
import com.czg.utils.PageUtil;
|
import com.czg.utils.PageUtil;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
import com.mybatisflex.core.query.QueryWrapper;
|
||||||
|
|
@ -38,8 +39,8 @@ public class SmsShopMoneyDetailServiceImpl extends ServiceImpl<SmsShopMoneyDetai
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.eq(SmsShopMoneyDetail::getShopId, shopId)
|
queryWrapper.eq(SmsShopMoneyDetail::getShopId, shopId)
|
||||||
.eq(SmsShopMoneyDetail::getIsDel, 0)
|
.eq(SmsShopMoneyDetail::getIsDel, 0)
|
||||||
.ge(SmsShopMoneyDetail::getCreateTime, param.getStartTime())
|
.ge(SmsShopMoneyDetail::getCreateTime, CzgStrUtils.getStrOrNull(param.getStartTime()))
|
||||||
.le(SmsShopMoneyDetail::getCreateTime, param.getEndTime())
|
.le(SmsShopMoneyDetail::getCreateTime, CzgStrUtils.getStrOrNull(param.getEndTime()))
|
||||||
.eq(SmsShopMoneyDetail::getType, param.getType())
|
.eq(SmsShopMoneyDetail::getType, param.getType())
|
||||||
.orderBy(SmsShopMoneyDetail::getCreateTime).desc();
|
.orderBy(SmsShopMoneyDetail::getCreateTime).desc();
|
||||||
return pageAs(PageUtil.buildPage(), queryWrapper, SmsShopMoneyDetailDTO.class);
|
return pageAs(PageUtil.buildPage(), queryWrapper, SmsShopMoneyDetailDTO.class);
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import com.czg.config.RabbitPublisher;
|
||||||
import com.czg.market.dto.SmsShopTemplateDTO;
|
import com.czg.market.dto.SmsShopTemplateDTO;
|
||||||
import com.czg.market.dto.SmsTemplateQueryDTO;
|
import com.czg.market.dto.SmsTemplateQueryDTO;
|
||||||
import com.czg.market.entity.ShopCoupon;
|
import com.czg.market.entity.ShopCoupon;
|
||||||
|
import com.czg.utils.CzgStrUtils;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
import com.mybatisflex.core.query.QueryWrapper;
|
||||||
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
||||||
|
|
@ -52,8 +53,8 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
|
||||||
public Page<SmsShopTemplateDTO> getTemplateList2(SmsTemplateQueryDTO param) {
|
public Page<SmsShopTemplateDTO> getTemplateList2(SmsTemplateQueryDTO param) {
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
queryWrapper
|
queryWrapper
|
||||||
.le(SmsShopTemplate::getCreateTime, param.getEndTime())
|
.le(SmsShopTemplate::getCreateTime, CzgStrUtils.getStrOrNull(param.getEndTime()))
|
||||||
.ge(SmsShopTemplate::getCreateTime, param.getStartTime())
|
.ge(SmsShopTemplate::getCreateTime, CzgStrUtils.getStrOrNull(param.getStartTime()))
|
||||||
.eq(SmsShopTemplate::getStatus, param.getStatus())
|
.eq(SmsShopTemplate::getStatus, param.getStatus())
|
||||||
.eq(SmsShopTemplate::getIsDel, 0)
|
.eq(SmsShopTemplate::getIsDel, 0)
|
||||||
.eq(SmsShopTemplate::getShopUse, param.getShopUse())
|
.eq(SmsShopTemplate::getShopUse, param.getShopUse())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue