From df412a0f464be20a11a0f77ad785a9dda05f0e2a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 May 2023 09:58:02 +0800
Subject: [PATCH] =?UTF-8?q?sync=E6=8E=A5=E6=94=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9C=AA=E5=90=8C=E6=AD=A5=E3=80=82=E6=88=90=E5=8A=9F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=88=B0=E6=B0=91=E7=94=9F=E8=AF=89=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=B7=B2=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/service/impl/XxxdEventServiceImpl.java  | 2 ++
 .../epdc/modules/item/service/impl/ItemServiceImpl.java    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
index d6602400d..23ced4257 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
@@ -76,6 +76,7 @@ public class XxxdEventServiceImpl extends BaseServiceImpl<XxxdEventDao, XxxdEven
         if (null == origin) {
             // 0已接收；1已转北上速办事件；2已完结
             entity.setInternalStatus(NumConstant.ZERO_STR);
+            entity.setSync(NumConstant.ZERO);
             insert(entity);
         } else {
             entity.setId(origin.getId());
@@ -100,6 +101,7 @@ public class XxxdEventServiceImpl extends BaseServiceImpl<XxxdEventDao, XxxdEven
         submitItemFormDTO.setIssueLongitude(Double.parseDouble(entity.getLongitude()));
         submitItemFormDTO.setIssueAddress(entity.getLocation());
         submitItemFormDTO.setPeopleFlag(NumConstant.ZERO_STR);
+        //区分 0 网格员上报还是 1 居民上报;2：新新向党随手拍
         submitItemFormDTO.setAppealSource(NumConstant.TWO_STR);
         submitItemFormDTO.setShowFlag(NumConstant.ZERO_STR);
         submitItemFormDTO.setDistributeTime(DateUtils.parse(entity.getPubTime(),"yyyy-MM-dd HH:mm:ss"));
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 0ca8bfc1b..1ed6eec84 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -5562,6 +5562,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         String communityId = "";
         // 街道id
         String streetId = "";
+        // 是否已同步,0：未同步;1，已同步
+        Integer sync = NumConstant.ZERO;
         LambdaUpdateWrapper<XxxdEventEntity> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(XxxdEventEntity::getId, xxxdEventEntityId);
         try {
@@ -5598,6 +5600,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if(StringUtils.isNotBlank(bssbEventId)){
                 //成功返回epdc_item.id，说明提交民生诉求成功，状态改为1
                 internalStatus=NumConstant.ONE_STR;
+                // 置为已同步
+                sync=NumConstant.ONE;
                 log.info("submitXxxdEventToItem上传到民生诉求成功：bssbEventId："+bssbEventId);
             }
         } catch (Exception e) {
@@ -5611,7 +5615,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId)
                     .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName)
                     .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId)
-                    .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId);
+                    .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId)
+                    .set(null != sync, XxxdEventEntity::getSync, sync);
             xxxdEventDao.update(null, updateWrapper);
         }