From 17aebb4e026f55579da35a94d32ad03c33a5ace0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Jan 2022 09:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5-=E5=8A=9E?= =?UTF-8?q?=E7=BB=93=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8A=9E?= =?UTF-8?q?=E7=BB=93=E5=B1=82=E7=BA=A7=E6=98=AF=E7=BD=91=E6=A0=BC=E7=9A=84?= =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=8A=9E=EF=BC=8C=E4=B8=8D=E6=98=AF=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E7=9A=84=E4=B8=BA=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataReportingServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 82d1a4a0e0..0752b72424 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -246,9 +246,9 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setEventDescription(project.getProjectContent()); dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N"); if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) { - dto.setWaysOfResolving(project.getOrgId().equals(project.getFinishOrg())?ProjectConstant.PROJECT_SELF_CLOSED:ProjectConstant.PROJECT_REPORT); //办结组织是机关时，办结层级为机关的层级 if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) { + dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT); //如果是孔村的项目办结层级需要降一级 if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) { if (StringUtils.isNotBlank(project.getFinishOrgLevel())) { @@ -268,6 +268,7 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel())); } } else if (OrgTypeConstant.DEPARTMENT.equals(project.getFinishOrgType())) { + dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT); //办结组织是部门时，办结层级为部门所在组织的曾经 String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON); int size = orgIds.length; @@ -276,6 +277,7 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setCompleteLevel(getCompleteLevel(agency.getLevel())); } } else { + dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED); //办结组织是网格时，办结层级为网格 dto.setCompleteLevel("5"); }