From caeef915d9b6f4e60a704d7454ff0f51f68e3a57 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 24 Oct 2022 14:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=8F=91=E5=B1=95=E3=80=81=E6=89=A7=E6=B3=95=E8=AF=89?= =?UTF-8?q?=E6=B1=82=E5=B7=B2=E7=BB=8F=E8=AF=84=E4=BB=B7=E4=B8=BA=E4=B8=8D?= =?UTF-8?q?=E6=BB=A1=E6=84=8F=E7=9A=84=E6=B0=91=E7=94=9F=E8=AF=89=E6=B1=82?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=B0=83=E7=94=A8=E5=B8=82=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=88=9D=E9=AA=8C=E7=94=B3=E8=AF=B7=E2=80=9D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemGridPlatformHandleStatusEnum.java | 1 + .../item/service/impl/ItemServiceImpl.java | 22 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index 329895987..766a062a6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -52,6 +52,7 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_HCSB(1103, "上报核查"), HANDLE_ZCZ(1104, "再处置"), HANDLE_XFPJ(1105, "下发评价"), + HANDLE_CYSQ(1106, "初验申请"), HANDLE_OTHER(999, "派遣中"); 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 f71c9e31d..ebcb49a81 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 @@ -4290,11 +4290,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null == entity) { throw new RenException("获取项目数据失败，项目Id->" + itemId); } - //2.判断是发展、执法诉求的不作处理(这两个诉求项目必须走诉求初验终验逻辑)；判断是已结案的不做处理（第二次可以评价了，没超过24小时用户评价了，此时就是已结案了） - if (!"0".equals(entity.getPeopleFlag()) || "10".equals(entity.getItemState())) { - logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); + //2.判断是已结案的不做处理（第二次可以评价了，没超过24小时用户评价了，此时就是已结案了） + if ("10".equals(entity.getItemState())) { return; } + //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 + if (!"0".equals(entity.getPeopleFlag()) || entity.getEvaluationScore() == 0) { + //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); + ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity(); + processEntity.setId(UUID.randomUUID().toString().replaceAll("-", "")); + processEntity.setItemId(itemId); + processEntity.setState(ItemGridPlatformHandleStatusEnum.HANDLE_CYSQ.getValue()); + processEntity.setHandleAdvice("诉求已上报市平台初验申请"); + processEntity.setOutHandleAdvice("初验申请"); + itemHandleProcessService.insert(processEntity); + //初验申请 + ItemHandleProcessDTO dto = new ItemHandleProcessDTO(); + dto.setId(processEntity.getId()); + pushToCityGridService.earlyInspectionApply(dto); + return; + } + //3.判断评价结果，未评价的赋值为满意并且结案给网格化平台推送结果；已评价的结果为满意直接结案给网格化推结果，不满意直接给网格化推结果 ItemHandleProcessDTO processDTO = new ItemHandleProcessDTO(); if (null == entity.getEvaluationScore() || 0 != entity.getEvaluationScore()) {