Browse Source

fix:武汉现场修改巡视任务

master
WangGuangYuan 9 months ago
parent
commit
5b54568f4b
1 changed files with 12 additions and 4 deletions
  1. +12
    -4
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

+ 12
- 4
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -408,6 +408,8 @@ public class PatrolTaskController extends BaseController {
}
patrolTaskService.updatePatrolTask(patrolTask);
// 修改新增一条新任务
// int taskId = patrolTaskService.insertPatrolTask(patrolTask);
Long majorId = patrolTask.getTaskId();
PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo();
patrolTaskInfo.setTaskMajorId(majorId + "");
@ -417,7 +419,13 @@ public class PatrolTaskController extends BaseController {
patrolTaskInfoService.deletePatrolTaskInfoByLineId(arr.getLineId());
}
}
// patrolTask.setTaskId((long) taskId);
if (patrolTask.getIsUp() == null || StringUtils.isEmpty(patrolTask.getIsUp())) {
// PatrolTask patrolTaskTemp = patrolTaskService.selectPatrolTaskByTaskId((long) taskId);
// patrolTaskTemp.setTaskCode(patrolTaskTemp.getTaskId() + "");
// patrolTaskService.updatePatrolTask(patrolTaskTemp);
patrolTask.setTaskCode(patrolTask.getTaskId() + "");
}
List<PrevPoint> prevPoints = patrolTask.getPrevPoints();
for (PrevPoint prevPoint : prevPoints) {
Map<String, String> videoPos = patrolTaskInfoService.selectVideoPosByPointId(prevPoint.getEqpBookId());
@ -1163,7 +1171,7 @@ public class PatrolTaskController extends BaseController {
jsonObjectString = jsonObject.get("taskId").toString();
if (StringUtils.isNotEmpty(jsonObjectString)) {
patrolTask.setTaskId(Long.valueOf(jsonObjectString));
patrolTask.setTaskCode(patrolTaskService.selectPatrolTaskByTaskId(Long.valueOf(jsonObjectString)).getTaskCode());
patrolTask.setCreateTime(patrolTaskService.selectPatrolTaskByTaskId(Long.valueOf(jsonObjectString)).getCreateTime());
}
}
@ -1328,8 +1336,8 @@ public class PatrolTaskController extends BaseController {
}
}
if (jsonObject.get("isEnable") != null) {
jsonObjectString = jsonObject.get("isEnable").toString();
if (jsonObject.get("isenable") != null) {
jsonObjectString = jsonObject.get("isenable").toString();
if (StringUtils.isNotEmpty(jsonObjectString)) {
patrolTask.setIsEnable(jsonObjectString);
}


Loading…
Cancel
Save