|
@@ -341,11 +341,11 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
private QueryWrapper getQueryWrapper(GoldSendPage vo) {
|
|
private QueryWrapper getQueryWrapper(GoldSendPage vo) {
|
|
|
QueryWrapper queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("d.operator_id", TokenContext.cureOperatorId());
|
|
queryWrapper.eq("d.operator_id", TokenContext.cureOperatorId());
|
|
|
- if(StringUtils.isNotEmpty(vo.getSendTimeStart())){
|
|
|
|
|
- queryWrapper.between("send_time", vo.getSendTimeStart(),vo.getSendTimeEnd());
|
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(vo.getSendTime())){
|
|
|
|
|
+ queryWrapper.eq("send_time", vo.getSendTime());
|
|
|
}
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(vo.getExpectTimeStart())){
|
|
|
|
|
- queryWrapper.between("expect_time", vo.getExpectTimeStart(),vo.getExpectTimeEnd());
|
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(vo.getExpectTime())){
|
|
|
|
|
+ queryWrapper.eq("expect_time", vo.getExpectTime());
|
|
|
}
|
|
}
|
|
|
if(StringUtils.isNotEmpty(vo.getIdNumber())){
|
|
if(StringUtils.isNotEmpty(vo.getIdNumber())){
|
|
|
queryWrapper.eq("d.id_number", vo.getIdNumber());
|
|
queryWrapper.eq("d.id_number", vo.getIdNumber());
|