|
|
@ -150,9 +150,9 @@ public class OcrPictureController extends BaseController{
|
|
|
|
//搜索时间段
|
|
|
|
//搜索时间段
|
|
|
|
String search_month = req.getParameter("search_month");
|
|
|
|
String search_month = req.getParameter("search_month");
|
|
|
|
if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){
|
|
|
|
if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){
|
|
|
|
queryWrapper.le("createTime", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
|
|
|
|
queryWrapper.le("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
|
|
|
|
}else if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) > 20){
|
|
|
|
}else if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) > 20){
|
|
|
|
queryWrapper.le("createTime",DataUtil.afterDateByWeek(Integer.parseInt(search_month) - 20));
|
|
|
|
queryWrapper.le("create_time",DataUtil.afterDateByWeek(Integer.parseInt(search_month) - 20));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//判断是否需要查询历史记录
|
|
|
|
//判断是否需要查询历史记录
|
|
|
@ -214,7 +214,7 @@ public class OcrPictureController extends BaseController{
|
|
|
|
|
|
|
|
|
|
|
|
String search_month = req.getParameter("search_month");
|
|
|
|
String search_month = req.getParameter("search_month");
|
|
|
|
if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){
|
|
|
|
if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){
|
|
|
|
queryWrapper.le("createTime",DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
|
|
|
|
queryWrapper.le("create_time",DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|