From 55e95f8ee6c333bdd3f8ae297d45e9bb564d1870 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 29 Sep 2022 10:25:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E9=AA=8C=E7=BB=88=E9=AA=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemGridPlatformHandleStatusEnum.java | 2 +- .../item/service/impl/ItemServiceImpl.java | 2 +- .../impl/PushToCityGridServiceImpl.java | 38 ++++--------------- 3 files changed, 10 insertions(+), 32 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 579c15b4c..934ce5cc7 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 @@ -49,7 +49,7 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_YQSH(1100, "延期审核"), HANDLE_SQBJ(1101, "申请办结"), HANDLE_CZ(1102, "处置"), - HANDLE_HCSB(1103, "核查上报"), + HANDLE_HCSB(1103, "上报核查"), HANDLE_ZCZ(1104, "再处置"), 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 d02b11bd8..c0cd74d27 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 @@ -2528,7 +2528,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else if(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == dto.getState()){ //初验申请 pushToCityGridService.earlyInspectionApply(dto); - } else if(ItemGridPlatformHandleStatusEnum.HANDLE_PZ.getValue() == dto.getState()){ + } else if(ItemGridPlatformHandleStatusEnum.HANDLE_HCSB.getValue() == dto.getState()){ //诉求初验 pushToCityGridService.earlyInspection(dto); //诉求终验 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 b6f39585f..aee9ba86a 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 @@ -1057,21 +1057,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { List list = new ArrayList<>(); if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) { ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ItemHandleProcessEntity::getItemId, item.getItemId()); - wrapper.ne(ItemHandleProcessEntity::getId, item.getId()); - wrapper.lt(ItemHandleProcessEntity::getCreatedTime, item.getCreatedTime()); - wrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime); - List processList = itemHandleProcessDao.selectList(wrapper); - if (CollectionUtils.isEmpty(processList)) { - return; - } - if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == processList.get(NumConstant.ZERO).getState()) { - String sqId = getSqid(item.getItemId()); - if (StringUtils.isNotBlank(sqId)) { - ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class); - list.add(dto); - } + String sqId = getSqid(item.getItemId()); + if (StringUtils.isNotBlank(sqId)) { + ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class); + list.add(dto); } } else { // 昨天 @@ -1125,21 +1114,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { List list = new ArrayList<>(); if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) { ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ItemHandleProcessEntity::getItemId, item.getItemId()); - wrapper.ne(ItemHandleProcessEntity::getId, item.getId()); - wrapper.lt(ItemHandleProcessEntity::getCreatedTime, item.getCreatedTime()); - wrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime); - List processList = itemHandleProcessDao.selectList(wrapper); - if (CollectionUtils.isEmpty(processList)) { - return; - } - if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == processList.get(NumConstant.ZERO).getState()) { - String sqId = getSqid(item.getItemId()); - if (StringUtils.isNotBlank(sqId)) { - ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class); - list.add(dto); - } + String sqId = getSqid(item.getItemId()); + if (StringUtils.isNotBlank(sqId)) { + ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class); + list.add(dto); } } else { // 昨天