From d7a9dca68d9ba17e764519f5d930c5f77d441b08 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 Oct 2022 19:17:50 +0800 Subject: [PATCH 1/2] 11 --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2b6dffbde..26b31f1b0 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 @@ -4462,7 +4462,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 手动拼接流转协助部门 ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); itemCirculationDeptResultDTO.setDeptId(dept.getData().getPid()); - itemCirculationDeptResultDTO.setDeptName(dept.getData().getParentName()); + itemCirculationDeptResultDTO.setDeptName("市北区委"); itemCirculationDeptResultDTO.setSelected(false); itemCirculationDeptResultDTO.setTypeKey(dept.getData().getTypeKey()); List deptList = new ArrayList<>(); From 7d13d1b3ab7a0d437cfe26b172037fab1646739e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Oct 2022 19:27:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E7=BB=93=E6=A1=88=E6=88=96?= =?UTF-8?q?=E8=80=85=E5=88=9D=E9=AA=8C=E7=94=B3=E8=AF=B7=E5=89=8D=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=AF=89=E6=B1=82=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 11 +++++------ .../item/service/impl/PushToCityGridServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) 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 c35bf5976..828be7cb0 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 @@ -4355,6 +4355,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem if ("10".equals(entity.getItemState())) { return; } + //走到这程序不管往下是去结案还是推初验申请都要先推评价 + //诉求评价 + pushToCityGridService.evaluation(itemId); //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 if (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0)) { //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); @@ -4409,12 +4412,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setCreatedTime(hEntity.getCreatedTime()); processDTO = closedItem(dto); } - - //4.市平台推送数据 - //4-1.诉求评价 - pushToCityGridService.evaluation(itemId); - //4-2.诉求结案 - pushToCityGridService.caseClosedSentoCity(processDTO.getId()); } /** @@ -4771,6 +4768,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem message = message + ":" + formDto; this.saveInterfaceLog(formDto.getItemId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody); + //诉求结案 + pushToCityGridService.caseClosedSentoCity(itemHandleProcessDto.getId()); return itemHandleProcessDto; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 12a946d8f..a0c6addd5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1028,7 +1028,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setCzjg("01"); break; default: - dto.setCzjg(""); + dto.setCzjg("01"); break; } //评价时间