Merge branch 'dev'

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;
@@ -94,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());
@@ -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());
         }
     }
 }