|
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
21
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
21
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
22
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
22
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
23
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
23
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
24
|
+import com.unis.common.util.DateUtil;
|
24
|
import com.unis.common.util.OrderNumberUtil;
|
25
|
import com.unis.common.util.OrderNumberUtil;
|
25
|
import com.unis.lawEnforcementSupervision.modular.lesCase.entity.LesCaseCount;
|
26
|
import com.unis.lawEnforcementSupervision.modular.lesCase.entity.LesCaseCount;
|
26
|
import com.unis.lawEnforcementSupervision.modular.lesCase.entity.OverCurrentYearMonth;
|
27
|
import com.unis.lawEnforcementSupervision.modular.lesCase.entity.OverCurrentYearMonth;
|
|
@@ -63,7 +64,7 @@ public class LesCaseServiceImpl extends ServiceImpl<LesCaseMapper, LesCase> impl
|
63
|
queryWrapper.lambda().like(LesCase::getCaseSource, lesCasePageParam.getCaseSource());
|
64
|
queryWrapper.lambda().like(LesCase::getCaseSource, lesCasePageParam.getCaseSource());
|
64
|
}
|
65
|
}
|
65
|
if (StringUtils.isNotEmpty(lesCasePageParam.getStartCaseDate()) && StringUtils.isNotEmpty(lesCasePageParam.getEndCaseDate())) {
|
66
|
if (StringUtils.isNotEmpty(lesCasePageParam.getStartCaseDate()) && StringUtils.isNotEmpty(lesCasePageParam.getEndCaseDate())) {
|
66
|
- queryWrapper.lambda().between(LesCase::getCaseDate, lesCasePageParam.getStartCaseDate(), lesCasePageParam.getEndCaseDate());
|
|
|
|
|
67
|
+ queryWrapper.lambda().between(LesCase::getCaseDate, lesCasePageParam.getStartCaseDate() + DateUtil.startTime, lesCasePageParam.getEndCaseDate() + DateUtil.endTime);
|
67
|
}
|
68
|
}
|
68
|
if (ObjectUtil.isAllNotEmpty(lesCasePageParam.getSortField(), lesCasePageParam.getSortOrder())) {
|
69
|
if (ObjectUtil.isAllNotEmpty(lesCasePageParam.getSortField(), lesCasePageParam.getSortOrder())) {
|
69
|
CommonSortOrderEnum.validate(lesCasePageParam.getSortOrder());
|
70
|
CommonSortOrderEnum.validate(lesCasePageParam.getSortOrder());
|