市平台上报相关修改

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

@@ -28,7 +28,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
-import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
 import com.elink.esua.epdc.commons.tools.enums.*;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -226,8 +225,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     private ItemCommentFeedbackDao itemCommentFeedbackDao;
     @Autowired
     private ItemAutoProcessRedis itemAutoProcessRedis;
+    @Resource
+    private ItemReportInterfaceLogDao itemReportInterfaceLogDao;
 
-//    @Autowired
+    //    @Autowired
 //    private ItemProcessModifyProducer itemProcessModifyProducer;
     @Resource
     private ItemDeptDao itemDeptDao;
@@ -3052,7 +3053,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             pushToCityGridService.appealScrap(dto);
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_HT.getValue() == dto.getState()) {
             // 诉求审核不通过
-            pushToCityGridService.appealAudit(dto.getId(), NumConstant.ZERO_STR);
+            if (("区中心".equals(dto.getGridUnitname()) || "区中心".equals(dto.getGridPartyname())) &&
+                    ("北尚诉办".equals(dto.getGridNextunitname()) || "北尚诉办".equals(dto.getGridNextpartname()))) {
+                pushToCityGridService.appealAudit(dto.getId(), NumConstant.ZERO_STR);
+            } else if (!"区中心".equals(dto.getGridUnitname()) && !"区中心".equals(dto.getGridPartyname())) {
+                pushToCityGridService.appealAudit(dto.getId(), NumConstant.ZERO_STR);
+            }
         }
         // 网格化平台，处置完成、延期申请、申请办结、向上申请
         if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState() ||
@@ -3063,13 +3069,35 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         // 网格化平台，处置完成
         if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState()) {
-            pushToCityGridService.appealHandling(dto);
+            String interfaceName = getInterfaceName(dto.getItemId());
+            if ("诉求处理".equals(interfaceName)) {
+                //诉求审核-同意
+                pushToCityGridService.appealAudit(dto.getId(), NumConstant.ONE_STR);
+                //诉求处理
+                itemAutoProcessRedis.produce(dto.getId().concat(":6"), System.currentTimeMillis() + (131 * 1000));
+            } else {
+                //诉求处理
+                pushToCityGridService.appealHandling(dto);
+            }
+
             // 诉求审核，上报市平台
             //pushToCityGridService.appealAudit(dto.getId());
             //itemAutoProcessRedis.produce(dto.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000));
         }
     }
 
+    private String getInterfaceName(String itemId) {
+        //获取最新上报市平台接口
+        LambdaQueryWrapper<ItemReportInterfaceLogEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ItemReportInterfaceLogEntity::getItemId, itemId);
+        wrapper.orderByDesc(ItemReportInterfaceLogEntity::getCreatedTime);
+        List<ItemReportInterfaceLogEntity> list = itemReportInterfaceLogDao.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return list.get(0).getInterfaceName();
+        }
+        return null;
+    }
+
     @Override
     public Result reportCallback(ItemPlatformProcessFormDTO formDto) {
         // 获取上报项目信息
@@ -4022,7 +4050,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
             try {
                 this.queryItemHandle(itemHandleProcessDto.getItemId());
-            }catch (Exception e) {
+            } catch (Exception e) {
                 log.error("驳回拉取流程失败");
             }
 
@@ -4634,6 +4662,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (NumConstant.FIVE_STR.equals(type)) {
             //社区吹哨，上报市平台
             pushToCityGridService.appealReporting(id, NumConstant.ZERO_STR);
+        } else if (NumConstant.SIX_STR.equals(type)) {
+            //诉求处理
+            ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectById(id);
+            pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(processEntity, ItemHandleProcessDTO.class));
         }
 
     }
@@ -4841,7 +4873,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             dto.setHandlerDept(dept.getData().getName());
             reReport(dto, ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
         }
-
+        //项目处理意见图片保存
+        if (CollectionUtils.isNotEmpty(formDTO.getHandleImages())) {
+            imgService.saveImages(formDTO.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
+        }
         // 更新项目最后一次处理时间
         ItemEntity itemEntity = new ItemEntity();
         itemEntity.setId(formDTO.getId());
@@ -4918,6 +4953,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //上报市平台
             pushToCityGridService.endInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
         }
+        //项目处理意见图片保存
+        if (CollectionUtils.isNotEmpty(formDTO.getHandleImages())) {
+            imgService.saveImages(formDTO.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
+        }
     }
 
     /**