|
@@ -268,10 +268,10 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
|
|
|
oneQueryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, billetHotsendChangeShift.getShiftGroup());
|
|
|
Date endChnageTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
|
|
|
oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startChnageTime, endChnageTime);
|
|
|
- search == false;
|
|
|
+ search = false;
|
|
|
}else if(oConvertUtils.isNotEmpty(queryDTO.getStartTime()) && oConvertUtils.isNotEmpty(queryDTO.getEndTime())){ // 时间范围
|
|
|
oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime,queryDTO.getStartTime(), queryDTO.getEndTime());
|
|
|
- search == false;
|
|
|
+ search = false;
|
|
|
}
|
|
|
|
|
|
if(oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) || search == true){ // 具体时间
|