From 5b54568f4b3101bb59f88bea44eebed54cb9f336 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Sat, 15 Mar 2025 10:00:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=AD=A6=E6=B1=89=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index bedf01d..b1186b5 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -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 prevPoints = patrolTask.getPrevPoints(); for (PrevPoint prevPoint : prevPoints) { Map 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); }