|
|
@@ -77,12 +77,13 @@ public class UserInspectQuestionServiceImpl extends BaseServiceImpl<UserInspectQ |
|
|
|
} |
|
|
|
// 巡检时间处理 |
|
|
|
if (!StringUtils.isEmpty(query.getInspectTime())) { |
|
|
|
String startTime = FunctionUtils.formatTime(Integer.valueOf(query.getInspectTime()), "yyyy-MM-dd") + " 0:00:00"; |
|
|
|
String endTime = FunctionUtils.formatTime(Integer.valueOf(query.getInspectTime()), "yyyy-MM-dd") + " 23:59:59"; |
|
|
|
String[] time = query.getInspectTime().split(" ~ "); |
|
|
|
String startTime = time[0] + " 0:00:00"; |
|
|
|
String endTime = time[1] + " 23:59:59"; |
|
|
|
query.setInspectStartTime(startTime); |
|
|
|
query.setInspectEndTime(endTime); |
|
|
|
} |
|
|
|
IPage<UserInspectQuestionListVo> page = new Page<>(query.getPage(), query.getPage()); |
|
|
|
IPage<UserInspectQuestionListVo> page = new Page<>(query.getPage(), query.getPageSize()); |
|
|
|
List<UserInspectQuestionListVo> inspectQuestionList = inspectQuestionMapper.getInspectQuestionList(page, query); |
|
|
|
if (!inspectQuestionList.isEmpty()) { |
|
|
|
inspectQuestionList.forEach(item -> { |