From 245c0c0b987d55d0b49bb24f3cd266691b80f3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Thu, 20 Jul 2023 09:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E5=86=B3=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E7=8E=AF=E8=8A=82=E9=83=BD=E5=86=99=E4=BA=86=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E8=AE=B8=E5=8F=AF=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ticket/twoTicket/service/impl/TicketProcessServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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,不展示附件)