事件上报添加flag字段

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

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

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());