Browse Source

修改BUG

master
牧羊人 4 years ago
parent
commit
cbd73d8670
2 changed files with 6 additions and 4 deletions
  1. +2
    -1
      src/main/java/com/taauav/front/service/impl/UserInspectDriverServiceImpl.java
  2. +4
    -3
      src/main/java/com/taauav/front/service/impl/UserInspectQuestionServiceImpl.java

+ 2
- 1
src/main/java/com/taauav/front/service/impl/UserInspectDriverServiceImpl.java View File

@@ -158,7 +158,8 @@ public class UserInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
//分配列表:期望巡检时间 任务列表:执行时间
String inspectTime = "inspectTime";
if (!StringUtils.isEmpty(map.get(inspectTime))) {
String startTime = FunctionUtils.formatTime(Integer.valueOf(map.get(inspectTime).toString()), "yyyy-MM-dd") + " 00:00:00";
String[] time = map.get(inspectTime).toString().split(" ~ ");
String startTime = time[0] + " 0:00:00";
map.put("executionTime", startTime);
}
//区属

+ 4
- 3
src/main/java/com/taauav/front/service/impl/UserInspectQuestionServiceImpl.java View File

@@ -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 -> {

Loading…
Cancel
Save