From c660361cc7370652fc8e98f664f117f21ea214ef Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 30 Nov 2021 16:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataReportingServiceImpl.java   | 16 ++++++++--------
 .../impl/BaseDisputeProcessServiceImpl.java      |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

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 83bb35a03d..7f5d1eb9eb 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
@@ -220,11 +220,11 @@ public class DataReportingServiceImpl implements DataReportingService {
 				if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
 					switch (project.getFinishOrgLevel()) {
 						case OrgTypeConstant.DISTRICT:
-							dto.setCompleteLevel("04");
+							dto.setCompleteLevel("3");
 							break;
 						case OrgTypeConstant.STREET:
 						case OrgTypeConstant.COMMUNITY:
-							dto.setCompleteLevel("06");
+							dto.setCompleteLevel("4");
 							break;
 						default:
 							break;
@@ -240,7 +240,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				dto.setCompleteLevel(getCompleteLevel(agency.getLevel()));
 			} else {
 				//办结组织是网格时，办结层级为网格
-				dto.setCompleteLevel("07");
+				dto.setCompleteLevel("5");
 			}
 		}
 		dto.setStatus(getProjectStatus(project.getProjectStatusCode()));
@@ -253,15 +253,15 @@ public class DataReportingServiceImpl implements DataReportingService {
 	private String getCompleteLevel(String level) {
 		switch (level) {
 			case OrgTypeConstant.PROVINCE:
-				return "01";
+				return "0";
 			case OrgTypeConstant.CITY:
-				return "02";
+				return "1";
 			case OrgTypeConstant.DISTRICT:
-				return "03";
+				return "2";
 			case OrgTypeConstant.STREET:
-				return "04";
+				return "3";
 			case OrgTypeConstant.COMMUNITY:
-				return "06";
+				return "4";
 			default:
 				return null;
 		}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
index 75fe8a588f..fbecbe0f10 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
@@ -107,6 +107,9 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                 entity.setCreateDate(item.getReportTime());
                 entity.setUpdateDate(new Date());
                 entity.setStatus(item.getStatus());
+                //业务不确定
+                entity.setSuccessfulOrNot(null);
+                entity.setEventNo(("py_").concat(item.getId()));
                 entity.setFirstEventCategory(item.getParentEventCategory());
                 entity.setSource("01");
                 entity.setSecondEventCategory(item.getEventCategory());