From 6d0f315c7ad6de4008d987bd834d6495c8b00b0e Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 22 Apr 2024 17:19:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=8F=96=E5=80=BC=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java index 2892717..a627cc6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java @@ -125,7 +125,6 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer private List fillTaskQuery(List taskList) { R> deptListR = sysClient.getDeptList(); List deptList = deptListR.isSuccess() ? deptListR.getData() : Lists.newArrayList(); - List emList = emInfoClient.list(); IntFunction convert = index -> { OperMaintenanceTaskEntity task = taskList.get(index); MaintenanceTaskQueryVO result = new MaintenanceTaskQueryVO(); @@ -137,9 +136,7 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer // 获取维护类型 result.setTypeName(DictCache.getValue(DictConstant.MAINTENANCE_TYPE_CODE,task.getTypeCode())); // 获取维护设备 - result.setEmName(emList.stream().filter( - em -> em.getNumber().equals(task.getEmCode()) - ).findFirst().map(EmInfoEntity::getName).orElse("")); + result.setEmName(task.getEmName()); // 获取执行时间 result.setPlanDisposeTime(DateUtil.formatDateTime(task.getDisposeTime())); result.setDisposeTime(Optional.ofNullable(task.getExecuteTime()).map(DateUtil::formatDateTime).orElse(""));