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