From a26d5806f7051e4b6fd10d1aa5a9a8ee07d41e33 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Tue, 12 Mar 2024 21:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E7=8F=AD=E5=80=BC=E7=8F=AD=E6=83=85=E5=86=B5=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 98fb1aa..6715144 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.hnac.hzims.equipment.entity.EmInfoEntity;
+import com.hnac.hzims.equipment.entity.PlanGenerationEntity;
 import com.hnac.hzims.message.MessageConstants;
 import com.hnac.hzims.message.dto.MessagePushRecordDto;
 import com.hnac.hzims.message.fegin.IMessageClient;
@@ -417,6 +418,12 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
     public ImsDutyRecVO getDdetail(ImsDutyRecVO vo) {
         ImsSchedulingVo imsSchedulingVo1 = imsDutyMainService.getByIdOneV2(vo.getDutyId());
         vo.setHeadDutyMainVo(imsSchedulingVo1);
+        ImsDutyLogEntity imsDutyLog = imsDutyLogService.getOne(new LambdaQueryWrapper<ImsDutyLogEntity>() {{
+            eq(ImsDutyLogEntity::getDutyId, vo.getDutyId()).last(" limit 1");
+        }});
+        if (ObjectUtil.isNotEmpty(imsDutyLog)) {
+            vo.setImsDutyLogEntity(imsDutyLog);
+        }
         ImsDutyMainEntity imsDutyMainEntity = imsDutyMainMapper.selectOne(new QueryWrapper<ImsDutyMainEntity>() {{
             eq("PRE_DUTY_ID", vo.getDutyId());
         }});