Merge branch 'dev_bugfix_ljj' into dev

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