diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 0e47a08..d1f8095 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -390,7 +390,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { //工作票危险点分析及控制措施票 - if (workTicket.getIsHazard()) { + if (workTicket.getIsHazard() && "签发人签发".equals(response.getTaskName())) { List ticketInfoDangers = workTicketVo.getTicketInfoDangers(); if (CollectionUtils.isNotEmpty(ticketInfoDangers)) { List collect = ticketInfoDangers.stream().map(item -> { @@ -399,8 +399,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { }).collect(Collectors.toList()); System.out.println("工作票危险点分析及控制措施票 : " + collect); - - ticketInfoDangerService.saveBatch(collect); } } @@ -854,7 +852,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { addFile(prefix, TicketConstant.SECURE_PAGE, docFileList); } //危险点分析与预控措施票 (true,展示附件,false,不展示附件) - if (workTicket.getIsSafety()) { + if (workTicket.getIsHazard()) { addFile(prefix, TicketConstant.SAFETY_PAGE, docFileList); } //动火工作票 (true,展示附件,false,不展示附件)