From f85d98241dabe266c183f1d1723b082b7e170e4d Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Fri, 12 Jun 2026 10:30:56 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA/=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clientobject/project/KeyProjectCO.java | 3 +++ .../project/dto/project/KeyProjectAddCmd.java | 3 +++ .../domain/enums/CreateSourceEnum.java | 20 +++++++++++++++++++ .../domain/model/project/KeyProjectE.java | 2 ++ .../dataobject/project/KeyProjectDO.java | 3 +++ 5 files changed, 31 insertions(+) create mode 100644 web-domain/src/main/java/com/zcloud/key/project/domain/enums/CreateSourceEnum.java diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java index 82c5f3b..0130c43 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java @@ -113,6 +113,9 @@ public class KeyProjectCO extends ClientObject { //状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工,7:开工申请驳回 @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工,7:开工申请驳回") private Integer applyStatus; + //创建来源,1:手动创建,2:自动创建 + @ApiModelProperty(value = "创建来源,1:手动创建,2:自动创建") + private Integer createSource; //经度 @ApiModelProperty(value = "经度") private String longitude; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java index f2bb285..16a6af6 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java @@ -97,6 +97,9 @@ public class KeyProjectAddCmd implements Serializable { @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工", name = "applyStatus") private Integer applyStatus; + @ApiModelProperty(value = "创建来源,1:手动创建,2:自动创建") + private Integer createSource; + @ApiModelProperty(value = "经度", name = "longitude") private String longitude; diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/CreateSourceEnum.java b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/CreateSourceEnum.java new file mode 100644 index 0000000..9a3b9fd --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/CreateSourceEnum.java @@ -0,0 +1,20 @@ +package com.zcloud.key.project.domain.enums; + +import lombok.Getter; + +/** + * 重点作业创建来源,1:手动创建,2:自动创建 + */ +@Getter +public enum CreateSourceEnum { + MANUAL(1, "手动创建"), + AUTO(2, "自动创建"); + + private final Integer code; + private final String name; + + CreateSourceEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java index 6b6ff80..d05aa37 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java @@ -66,6 +66,8 @@ public class KeyProjectE extends BaseE { private LocalDateTime completedConfirmDateTime; //状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工,7:开工申请驳回 private Integer applyStatus; + //创建来源,1:手动创建,2:自动创建 + private Integer createSource; //驳回原因 private String rejectReason; //经度 diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java index eb7782f..fda4967 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java @@ -110,6 +110,9 @@ public class KeyProjectDO extends BaseDO { //状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工,7:开工申请驳回 @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工,7:开工申请驳回") private Integer applyStatus; + //创建来源,1:手动创建,2:自动创建 + @ApiModelProperty(value = "创建来源,1:手动创建,2:自动创建") + private Integer createSource; //经度 @ApiModelProperty(value = "经度") private String longitude;