From ef75fdaecd09e8457ae491a62690c5a22834c614 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 25 Sep 2023 14:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=BA=E5=91=98=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java | 2 -- .../ningdatech/pmapi/safety/model/dto/PersonSafetyInfoDTO.java | 3 +++ .../pmapi/safety/model/dto/SupplierSafetyQualificationDTO.java | 9 +++++++++ .../ningdatech/pmapi/safety/model/entity/PersonSafetyInfo.java | 3 +++ .../pmapi/safety/model/entity/SupplierSafetyQualification.java | 9 +++++++++ .../com/ningdatech/pmapi/safety/model/vo/PersonSafetyInfoVO.java | 3 +++ .../pmapi/safety/model/vo/SupplierSafetyQualificationVO.java | 9 +++++++++ 7 files changed, 36 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java index eced4d7..ccb67c7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java @@ -63,8 +63,6 @@ public class SafetyRiskManage { public PageVo personMonitorList(ProjectListReq req) { LambdaQueryWrapper query = Wrappers.lambdaQuery(Project.class) .eq(Project::getNewest, Boolean.TRUE) - .ge(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()) - .ne(Project::getStatus, ProjectStatusEnum.OPERATION.getCode()) .eq(StringUtils.isNotBlank(req.getRegionCode()),Project::getAreaCode,req.getRegionCode()) .like(StringUtils.isNotBlank(req.getProjectName()),Project::getProjectName,req.getProjectName()) .like(StringUtils.isNotBlank(req.getBuildOrgName()),Project::getBuildOrgName,req.getBuildOrgName()) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/PersonSafetyInfoDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/PersonSafetyInfoDTO.java index 8527086..9f75e7b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/PersonSafetyInfoDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/PersonSafetyInfoDTO.java @@ -35,6 +35,9 @@ public class PersonSafetyInfoDTO implements Serializable { @ApiModelProperty("调查报告") private String investigationReport; + @ApiModelProperty("联系方式") + private String contactInfo; + private LocalDateTime createOn; private LocalDateTime updateOn; private String createBy; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/SupplierSafetyQualificationDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/SupplierSafetyQualificationDTO.java index 512d9c7..783edd8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/SupplierSafetyQualificationDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/dto/SupplierSafetyQualificationDTO.java @@ -33,4 +33,13 @@ public class SupplierSafetyQualificationDTO implements Serializable { @ApiModelProperty("安全协议") private String safetyProtocol; + + @ApiModelProperty("供应商名称") + private String supplierName; + + @ApiModelProperty("厂商人员名称") + private String username; + + @ApiModelProperty("联系方式") + private String contactInfo; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/PersonSafetyInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/PersonSafetyInfo.java index 0b7139e..c2679a7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/PersonSafetyInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/PersonSafetyInfo.java @@ -41,6 +41,9 @@ public class PersonSafetyInfo implements Serializable { @ApiModelProperty("调查报告") private String investigationReport; + @ApiModelProperty("联系方式") + private String contactInfo; + private LocalDateTime createOn; private LocalDateTime updateOn; private String createBy; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/SupplierSafetyQualification.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/SupplierSafetyQualification.java index c2632b6..9593c4b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/SupplierSafetyQualification.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/entity/SupplierSafetyQualification.java @@ -38,6 +38,15 @@ public class SupplierSafetyQualification implements Serializable { @ApiModelProperty("安全协议") private String safetyProtocol; + @ApiModelProperty("供应商名称") + private String supplierName; + + @ApiModelProperty("厂商人员名称") + private String username; + + @ApiModelProperty("联系方式") + private String contactInfo; + private LocalDateTime createOn; private LocalDateTime updateOn; private String createBy; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/PersonSafetyInfoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/PersonSafetyInfoVO.java index 07c7019..5203112 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/PersonSafetyInfoVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/PersonSafetyInfoVO.java @@ -36,6 +36,9 @@ public class PersonSafetyInfoVO implements Serializable { @ApiModelProperty("调查报告") private String investigationReport; + @ApiModelProperty("联系方式") + private String contactInfo; + private LocalDateTime createOn; private LocalDateTime updateOn; private String createBy; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/SupplierSafetyQualificationVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/SupplierSafetyQualificationVO.java index ab4943b..796c900 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/SupplierSafetyQualificationVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/model/vo/SupplierSafetyQualificationVO.java @@ -36,6 +36,15 @@ public class SupplierSafetyQualificationVO implements Serializable { @ApiModelProperty("安全协议") private String safetyProtocol; + @ApiModelProperty("供应商名称") + private String supplierName; + + @ApiModelProperty("厂商人员名称") + private String username; + + @ApiModelProperty("联系方式") + private String contactInfo; + private LocalDateTime createOn; private LocalDateTime updateOn; private String createBy;