From 0cc932e57175833ef981203896514388e4da3d57 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 22 Mar 2023 13:49:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=86=E6=94=AF=20?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82bizDomain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/model/dto/ProjectConditionDTO.java | 3 ++- .../java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java | 4 ++-- .../java/com/ningdatech/pmapi/projectlib/model/entity/Project.java | 4 ++-- .../com/ningdatech/pmapi/todocenter/model/req/ProcessDetailReq.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectConditionDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectConditionDTO.java index 24f89c2..8f00c79 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectConditionDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectConditionDTO.java @@ -31,5 +31,6 @@ public class ProjectConditionDTO implements Serializable { @ApiModelProperty("是否数字化改革项目 0:否 1:是") private Integer isDigitalReform; - + @ApiModelProperty("综合业务领域 1: '党政机关整体智治',2: '数字政府',3: '数字经济',4: '数字社会',7: '数字文化',5: '数字法治',6: '一体化智能化公共数据平台', 8: '基层智治'") + private Integer bizDomain; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index 291fa67..0e4e2dd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java @@ -88,8 +88,8 @@ public class ProjectDTO implements Serializable { @ApiModelProperty("是否数字化改革项目 0:否 1:是") private Integer isDigitalReform; - @ApiModelProperty("综合业务领域") - private String bizDomain; + @ApiModelProperty("综合业务领域 1: '党政机关整体智治',2: '数字政府',3: '数字经济',4: '数字社会',7: '数字文化',5: '数字法治',6: '一体化智能化公共数据平台', 8: '基层智治'") + private Integer bizDomain; @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇") private Integer buildLevel; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index 109a2ba..cb8ec20 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java @@ -92,8 +92,8 @@ public class Project implements Serializable { @ApiModelProperty("是否数字化改革项目 0:否 1:是") private Integer isDigitalReform; - @ApiModelProperty("综合业务领域") - private String bizDomain; + @ApiModelProperty("综合业务领域 1: '党政机关整体智治',2: '数字政府',3: '数字经济',4: '数字社会',7: '数字文化',5: '数字法治',6: '一体化智能化公共数据平台', 8: '基层智治'") + private Integer bizDomain; @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇") private Integer buildLevel; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/req/ProcessDetailReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/req/ProcessDetailReq.java index fd3dc3c..8134e47 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/req/ProcessDetailReq.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/req/ProcessDetailReq.java @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull; public class ProcessDetailReq { @ApiModelProperty("流程实例ID") - @NotNull + @NotNull(message = "流程实例不能为空") private String instanceId; @ApiModelProperty("流程节点ID") From b01db8b427bb9d3992afb3e764d755a92c05ae5b Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 22 Mar 2023 13:52:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=86=E6=94=AF=20?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82bizDomain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java index 13d762c..d9631dc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java @@ -58,7 +58,7 @@ public class ProjectLibListItemVO { private String buildOrg; @ApiModelProperty("业务领域") - private String bizDomain; + private Integer bizDomain; @ApiModelProperty("流程状态") private Integer processStatus; From 7ac2f5154cbfb203375966ae497cd2d87964f7bc Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 22 Mar 2023 15:45:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=94=B9=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index 08afd44..1ef9749 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java @@ -94,7 +94,7 @@ public class ProjectDetailVO { private Integer isDigitalReform; @ApiModelProperty("综合业务领域") - private String bizDomain; + private Integer bizDomain; @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇") private Integer buildLevel;