From 4aea47ba2fcbaee33f8151c482ebebd651b3e6bc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 14 Mar 2022 10:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0work=5Feven?= =?UTF-8?q?t=E6=9D=A5=E6=BA=90=EF=BC=8C=E4=B8=BA=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AE=BE=E8=AE=A1=E5=88=B0=E7=9A=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/todata/impl/ProjectExtractServiceImpl.java | 2 +- .../main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index 64fa62dd14..eac5549584 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -186,7 +186,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { } } } else if (ProjectConstant.PROJECT_ORIGIN_WORK_EVENT.equals(project.getOrigin())){ - entity.setGridId(project.getOrigin()); + entity.setGridId(project.getOriginId()); } String[] pIds = project.getOrgIdPath().split(StrConstant.COLON); if (pIds.length > 1) { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java index bf00afa2b7..0ce775f1ad 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java @@ -69,11 +69,11 @@ public class ProjectApprovalFormDTO implements Serializable { * 立项类型 直接立项：agency，上报事件：work_event */ @NotBlank(message = "立项类型不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) - private String type; + private String type = "agency"; /** * 网格ID */ @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class}) - private String gridId; + private String gridId; }