From 36b623d328dd8dd4712309a5e312d1cf139acaa3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 26 Nov 2021 11:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0flag=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java | 5 +++++
 .../epmet/opendata/entity/BaseConflictsResolveEntity.java    | 4 ++++
 .../opendata/service/impl/BaseDisputeProcessServiceImpl.java | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java
index 2f72939254..3787374f7f 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java
@@ -204,4 +204,9 @@ public class BaseConflictsResolveDTO implements Serializable {
      */
 	private Date resolveTime;
 
+    /**
+     * 同步状态 0 未同步， 1 已同步
+     */
+    private String flag;
+
 }
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java
index 42a8323444..c2f1907a07 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java
@@ -206,4 +206,8 @@ public class BaseConflictsResolveEntity{
 	 */
 	private Date resolveTime;
 
+	/**
+	 * 同步状态 0 未同步， 1 已同步
+	 */
+	private String flag;
 }
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 aa3ad359eb..741dcec301 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
@@ -106,6 +106,10 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                 entity.setStatus(item.getStatus());
                 entity.setFirstEventCategory(item.getParentEventCategory());
                 entity.setSecondEventCategory(item.getEventCategory());
+                entity.setResolveWay(item.getWaysOfResolving());
+                entity.setResolveGridLevel(item.getCompleteLevel());
+                entity.setResolveTime(item.getCompleteTime());
+                entity.setFlag(NumConstant.ZERO_STR);
                 return entity;
             }).collect(Collectors.toList());