From dd412295027c403e3cc3a808aaf2d2b1357bcf4e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 8 May 2023 15:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ItemGridPlatformHandleStatusEnum.java | 2 ++ .../modules/item/service/impl/ItemServiceImpl.java | 10 ++++++++++ .../service/impl/PushToCityGridServiceImpl.java | 13 ++++++++++--- 3 files changed, 22 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 f180b59b3..92cd79373 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 @@ -59,6 +59,8 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_QSJB_DB(2018, "诉求督办"), HANDLE_QSJB_BH(2020, "吹哨驳回"), HANDLE_QSJB_FK(2021, "吹哨反馈"), + HANDLE_QSJB_JS(1111, "响应接收"), + 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 642cf8e1e..5c4dcd8df 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 @@ -5282,6 +5282,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (item == null) { return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); } + Date date = new Date(); + LambdaQueryWrapper lambdaQueryWrapper = + new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getId()) + .eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue()) + .eq(ItemHandleProcessEntity::getCreatedTime,date); + List processEntities = itemHandleProcessDao.selectList(lambdaQueryWrapper); + if (processEntities.size()>0){ + return new Result(); + } process.setItemId(item.getId()); process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue()); process.setHandleAdvice(formDTO.getBhyy()); @@ -5290,6 +5299,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem process.setHandlerDeptId(1L); process.setGridPartyid(formDTO.getBhrId()); process.setGridPartyname(formDTO.getBhr()); + process.setCreatedTime(date); int result = itemHandleProcessDao.insert(process); if (result == 1) { successFlag = YesOrNoEnum.YES.value(); 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 7172fb9fc..11e230a04 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 @@ -1420,12 +1420,17 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { @Override public void receive(String processId) { + Date date = new Date(); ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processId); if (item == null) { return; } - if (item.getState() == 1111){ + + LambdaQueryWrapper entityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,1111); + List list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper); + + if (list.size()>0){ return; } @@ -1433,7 +1438,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSqid(getSqid(item.getItemId())); dto.setCzbs("01"); //终验时间 - dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); + dto.setCzsj(DateUtils.format(date, DateUtils.DATE_TIME_PATTERN)); //终验人员 ReceiveResultDTO.CzrBean czr = new ReceiveResultDTO.CzrBean(); @@ -1455,8 +1460,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { saveLog(item.getItemId(), item.getId(), "响应接收", PushToCityGridConstant.RECEIVE, JSONObject.toJSONString(dto), result); + item.setId(null); item.setState(1111); - itemHandleProcessDao.updateById(item); + item.setCreatedTime(date); + itemHandleProcessDao.insert(item); }