安全人员更新

pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java

@@ -63,8 +63,6 @@ public class SafetyRiskManage {
     public PageVo<ProjectMonitorVO> personMonitorList(ProjectListReq req) {
         LambdaQueryWrapper<Project> 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())

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;

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;
 }

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;

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;

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;

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;