From 375997f1dfcb98a1bc566ab1e23a9d5b8961e31b Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 21 Jul 2026 14:04:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(project):=20=E6=B7=BB=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E5=A4=A7=E5=B1=8F=E9=87=8D=E7=82=B9=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/KeyProjectLargeScreenCO.java | 111 +++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenCO.java index d52a513..fd6fe86 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenCO.java @@ -1,9 +1,13 @@ package com.zcloud.key.project.dto.clientobject.project; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 可视化大屏重点作业列表返回 * @@ -11,12 +15,115 @@ import lombok.EqualsAndHashCode; * @Date 2026-07-21 */ @Data -@EqualsAndHashCode(callSuper = true) -public class KeyProjectLargeScreenCO extends KeyProjectCO { +public class KeyProjectLargeScreenCO { @ApiModelProperty(value = "企业名称") private String corpinfoName; @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西") private Integer portArea; + + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id-重点作业id") + private String keyProjectId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //辖区单位企业id + @ApiModelProperty(value = "辖区单位企业id") + private Long jurisdictionCorpinfoId; + //辖区单位部门id + @ApiModelProperty(value = "辖区单位部门id") + private Long jurisdictionDepartmentId; + //辖区项目负责人id + @ApiModelProperty(value = "辖区项目负责人id") + private Long jurisdictionUserId; + //主管部门id + @ApiModelProperty(value = "主管部门id") + private Long masterDepartmentId; + //是否已有项目内作业,1:是,0:否 + @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否") + private Integer projectWorkFlag; + //重点作业名称 + @ApiModelProperty(value = "项目id") + private String projectId; + //重点作业名称 + @ApiModelProperty(value = "重点作业名称") + private String projectName; + //涉及重点作业属性类型 + @ApiModelProperty(value = "涉及重点作业属性类型") + private String projectType; + //涉及重点作业属性类型名称 + @ApiModelProperty(value = "涉及重点作业属性类型名称") + private String projectTypeName; + //计划工期开始时间 + @ApiModelProperty(value = "计划工期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate planWorkStartDate; + //计划工期结束时间 + @ApiModelProperty(value = "计划工期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate planWorkEndDate; + //相关方企业id + @ApiModelProperty(value = "相关方企业id") + private Long xgfCorpinfoId; + //相关方单位负责人id + @ApiModelProperty(value = "相关方单位负责人id") + private Long xgfMasterUserId; + //相关方单位负责人手机号 + @ApiModelProperty(value = "相关方单位负责人手机号") + private String xgfMasterPhone; + //是否设置监理单位,1:是,0:否 + @ApiModelProperty(value = "是否设置监理单位,1:是,0:否") + private Integer supervisionUnitFlag; + @ApiModelProperty(value = "未验收隐患数") + private Integer uncheckHiddenCount; + + @ApiModelProperty(value = "未完成安全环保检查") + private Integer unFinishInspectionCount; + //监理单位名称 + @ApiModelProperty(value = "监理单位名称") + private String supervisionUnitCorpName; + //监理单位负责人名称 + @ApiModelProperty(value = "监理单位负责人名称") + private String supervisionUnitUserName; + //监理单位负责人手机号 + @ApiModelProperty(value = "监理单位负责人手机号") + private String supervisionUnitUserPhone; + //申请时间 + @ApiModelProperty(value = "申请时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime applyDateTime; + + //申请确认时间 + @ApiModelProperty(value = "申请确认时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime applyConfirmDateTime; + //完工时间 + @ApiModelProperty(value = "完工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime completedDateTime; + //完工确认时间 + @ApiModelProperty(value = "完工确认时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime completedConfirmDateTime; + + //状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工 + @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工") + private Integer applyStatus; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; }