From eee0993d7c6d0d280edf22ef800bc9edb46cff63 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Thu, 18 Jul 2024 15:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java | 2 +- .../hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java | 2 +- .../operational/maintenance/scheduled/MaintenanceTaskCreateTask.java | 2 +- .../operational/maintenance/service/impl/MaintenanceServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java index e534024..e104f77 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java @@ -107,7 +107,7 @@ public class TaskGenerateAspect { PlanMsgRecordDto recordDto = new PlanMsgRecordDto() .setDeptId(taskEntity.getCreateDept()) .setTemplateId(taskEntity.getMessageTemplateId()) - .setTaskId(taskEntity.getId()) + .setTaskId(taskEntity.getId().toString()) .setTenantId(Optional.ofNullable(AuthUtil.getTenantId()).orElse(taskEntity.getTenantId())) .setReceiver(userId) .setCreateUser(userId) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java index f633d72..27179f0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java @@ -144,7 +144,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service, StartProces if (StringUtils.isNotBlank(param)){ variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); }else { - variables = JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity,DateUtil.PATTERN_DATETIME), Map.class); + variables = JSONObject.parseObject(entity); } variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()))); R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(), diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index 39783f9..dca558c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -263,7 +263,7 @@ public class MaintenanceTaskCreateTask { planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId()); planMsgRecordDto.setCreateUser(taskEntity.getCreateUser()); planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(),zoneId)); - planMsgRecordDto.setTaskId(taskEntity.getId()); + planMsgRecordDto.setTaskId(taskEntity.getId().toString()); planMsgRecordDto.setDeptId(taskEntity.getCreateDept()); planMsgRecordDto.setReceiver(userId); TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index 3a62461..5c0b65e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -366,7 +366,7 @@ public class MaintenanceServiceImpl implements MaintenanceService { planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId()); planMsgRecordDto.setCreateUser(taskEntity.getCreateUser()); planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(), zoneId)); - planMsgRecordDto.setTaskId(taskEntity.getId()); + planMsgRecordDto.setTaskId(taskEntity.getId().toString()); planMsgRecordDto.setDeptId(taskEntity.getCreateDept()); planMsgRecordDto.setReceiver(userId); TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null);