市平台上报相关修改

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java

@@ -76,6 +76,6 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealHandling")
     public Result AppealHandling(@RequestBody ItemHandleProcessDTO dto){
-        return pushToCityGridService.appealHandling(dto);
+        return pushToCityGridService.appealHandling(dto, "0");
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java

@@ -140,7 +140,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 11:01
      */
-    Result appealHandling(ItemHandleProcessDTO dto);
+    Result appealHandling(ItemHandleProcessDTO dto, String addTime);
 
     /**
      * 2.8 诉求退件

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -1874,7 +1874,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SysDeptDTO dept = resultdept.getData();
             if (!OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dept.getTypeKey())) {
                 // 诉求处理，上报市平台
-                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class), NumConstant.ZERO_STR);
             }
             // 诉求审核，上报市平台
             //itemAutoProcessRedis.produce(handleProcessEntity.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000));
@@ -3077,7 +3077,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemAutoProcessRedis.produce(dto.getId().concat(":6"), System.currentTimeMillis() + (131 * 1000));
             } else {
                 //诉求处理
-                pushToCityGridService.appealHandling(dto);
+                pushToCityGridService.appealHandling(dto, NumConstant.ZERO_STR);
             }
 
             // 诉求审核，上报市平台
@@ -3854,7 +3854,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
             // 社区审批，上报市平台
-            pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
+            pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class), NumConstant.ZERO_STR);
             // 诉求审核，上报市平台
             //itemAutoProcessRedis.produce(process.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000));
             //ItemHandleProcessDTO d = ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class);
@@ -4665,7 +4665,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (NumConstant.SIX_STR.equals(type)) {
             //诉求处理
             ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectById(id);
-            pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(processEntity, ItemHandleProcessDTO.class));
+            pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(processEntity, ItemHandleProcessDTO.class), NumConstant.ONE_STR);
         }
 
     }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -614,7 +614,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 11:02
      */
     @Override
-    public Result appealHandling(ItemHandleProcessDTO processDTO) {
+    public Result appealHandling(ItemHandleProcessDTO processDTO, String addTime) {
         String id = processDTO.getId();
         String itemId = processDTO.getItemId();
         AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
@@ -684,7 +684,11 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 处理类型
         data.setSqlx(itemDTO.getCategoryCodeOrigin());
         // 处理时间
+        if (NumConstant.ONE_STR.equals(addTime)) {
+            data.setCzsj(DateUtils.format(DateUtils.addDateSeconds(item.getCreatedTime(), 121), DateUtils.DATE_TIME_PATTERN));
+        } else {
             data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
+        }
         // 处理内容
         data.setCznr(item.getHandleAdvice());
         // 处理照片