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

---
 .../service/impl/BaseDisputeProcessServiceImpl.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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 484d2b17b7..9e561930ed 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
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -113,17 +112,10 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                 entity.setResolveWay(item.getWaysOfResolving());
                 entity.setResolveGridLevel(item.getCompleteLevel());
                 entity.setResolveTime(item.getCompleteTime());
-                if(SystemMessageType.PROJECT_ADD.equals(formDTO.getType())) {
-                    entity.setFlag(NumConstant.ZERO_STR);
-                }
                 return entity;
             }).collect(Collectors.toList());
 
-            if(SystemMessageType.PROJECT_ADD.equals(formDTO.getType())){
-                baseConflictsResolveService.saveOrUpdateBatch(resolveList, formDTO.getPageSize());
-            }else {
-                baseConflictsResolveService.saveOrUpdateBatch(resolveList, formDTO.getPageSize());
-            }
+            baseConflictsResolveService.saveOrUpdateBatch(resolveList, formDTO.getPageSize());
         }
     }
 }
\ No newline at end of file

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

---
 .../opendata/service/impl/BaseDisputeProcessServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9e561930ed..5db720a2b1 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
@@ -93,7 +93,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
 
             List<BaseConflictsResolveEntity> resolveList = list.stream().map(item -> {
                 BaseConflictsResolveEntity entity = new BaseConflictsResolveEntity();
-                entity.setId(item.getId());
+                entity.setId(item.getId().concat("_PY"));
                 entity.setGridId(deptMap.get(item.getOrgId()));
                 entity.setGridName(item.getOrgName());
                 entity.setEventName(item.getEventName());