Преглед на файлове

作业详情步骤数据补充

车车 преди 3 месеца
родител
ревизия
2038555c42

+ 3 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/jobticket/vo/JobTicketRespVO.java

@@ -109,4 +109,7 @@ public class JobTicketRespVO {
     @Schema(description = "作业用户")
     private List<JobTicketUserRespVO> ticketUserList;
 
+    @Schema(description = "作业日志")
+    private List<TicketOperLogRespVO> ticketOperLogList;
+
 }

+ 1 - 1
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/holiday/HolidayService.java

@@ -20,7 +20,7 @@ public interface HolidayService extends IService<HolidayDO> {
     /**
      * 创建节假日设置
      *
-     * @param createReqVO 创建信息
+     * @param vo 创建信息
      * @return 编号
      */
     Boolean updateHolidayList(@Valid HolidayUpdateListVO vo);

+ 8 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/jobticket/JobTicketServiceImpl.java

@@ -63,6 +63,8 @@ public class JobTicketServiceImpl extends ServiceImpl<JobTicketMapper, JobTicket
     private WorkflowModeService workflowModeService;
     @Resource
     private AttributeService attributeService;
+    @Resource
+    private TicketOperLogService ticketOperLogService;
 
     @Transactional
     @Override
@@ -239,6 +241,12 @@ public class JobTicketServiceImpl extends ServiceImpl<JobTicketMapper, JobTicket
                 .eq(JobTicketUserDO::getTicketId, id));
         List<JobTicketUserRespVO> ticketUserRespVOList = BeanUtils.toBean(ticketUserDOList, JobTicketUserRespVO.class);
         bean.setTicketUserList(ticketUserRespVOList);
+        // 作业日志
+        List<TicketOperLogDO> ticketOperLogDOS = ticketOperLogService.list(Wrappers.<TicketOperLogDO>lambdaQuery()
+                .eq(TicketOperLogDO::getTicketId, id)
+                .orderByAsc(TicketOperLogDO::getId));
+        List<TicketOperLogRespVO> ticketOperLogRespVOList = BeanUtils.toBean(ticketOperLogDOS, TicketOperLogRespVO.class);
+        bean.setTicketOperLogList(ticketOperLogRespVOList);
         return bean;
     }