From b91970d5beef825af3229250789b2cd1ecb89a82 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 19 Jun 2024 20:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2bug=EF=BC=8C=E9=A2=84=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B4=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/leaflet/WarningLeafletParam.java | 10 +++-- .../pojo/po/leaflet/WarningLeaflet.java | 12 ++--- ...SupervisionDevMainReportPOServiceImpl.java | 15 ++++--- .../SupervisionTempLineReportServiceImpl.java | 15 ++++--- .../impl/WarningLeafletServiceImpl.java | 29 ++++++------ .../survey/impl/SurveyPlanServiceImpl.java | 44 ++++++++++++------- .../survey/impl/SurveyTestServiceImpl.java | 17 ++++--- .../user/impl/UserReportPOServiceImpl.java | 14 ++++-- 8 files changed, 92 insertions(+), 64 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java index 5910e9258..20b732e05 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java @@ -1,7 +1,5 @@ package com.njcn.supervision.pojo.param.leaflet; -import com.njcn.db.bo.BaseEntity; -import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -28,7 +26,8 @@ import java.util.Map; public class WarningLeafletParam implements Serializable{ private static final long serialVersionUID = 1L; - + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; /** * 预告警单名称 */ @@ -71,6 +70,11 @@ public class WarningLeafletParam implements Serializable{ @ApiModelProperty(value = "设备编号") private String processInstanceId; + /** + * 整改意见 + */ + @ApiModelProperty(value = "整改意见") + private String reformAdvice; /** * 问题详细描述 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java index bdd2be140..9a2bfeeca 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java @@ -2,12 +2,9 @@ package com.njcn.supervision.pojo.po.leaflet; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; + +import java.io.Serializable; /** *

@@ -74,7 +71,10 @@ public class WarningLeaflet extends BaseEntity implements Serializable{ * 问题详细描述 */ private String issueDetail; - + /** + * 整改意见 + */ + private String reformAdvice; /** * 采取措施 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 419021332..3afc3ec82 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -68,15 +68,18 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(warningLeafletUpdateParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - warningLeaflet.setProcessInstanceId(processInstanceId); + if(Objects.equals(warningLeafletUpdateParam.getSaveOrCheckflag(),"2")) { + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(warningLeafletUpdateParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + warningLeaflet.setProcessInstanceId(processInstanceId); + } + this.baseMapper.updateById(warningLeaflet); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index a8e7a7216..f24dc7272 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -106,14 +106,21 @@ public class SurveyPlanServiceImpl extends ServiceImpl userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper);