Merge remote-tracking branch 'origin/master'

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());
         }});