diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 570116e5c..73bddbf08 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -797,7 +797,10 @@ public class ItemController { **/ @GetMapping("getItemList") public Result> getItemList(@RequestParam Map params){ - return itemService.getItemList(params); + log.info("产品调用"+params.toString()); + Result> itemList = itemService.getItemList(params); + log.info("产品调用返回"+itemList.toString()); + return itemList; } } 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 0bc34c4aa..9cda31fb4 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 @@ -4270,12 +4270,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessDTO processDTO = itemHandleProcessDao.getLastProcess(itemPlat.getReferenceId()); if (processDTO == null) { return new Result().error("未查到相关事件流程信息"); - } else if ("0".equals(formDto.getState()) && ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue() == processDTO.getState()) { - return new Result().error("请勿重复进行下放评价操作"); - } else if ("1".equals(formDto.getState()) && ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue() == processDTO.getState()) { - return new Result().error("请勿重复进行驳回操作"); } +// else if ("0".equals(formDto.getState()) && ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue() == processDTO.getState()) { +// return new Result().error("请勿重复进行下放评价操作"); +// } else if ("1".equals(formDto.getState()) && ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue() == processDTO.getState()) { +// return new Result().error("请勿重复进行驳回操作"); +// } + // 插入项目处理进度表 ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO(); itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", "")); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 74675691c..c4f284405 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1154,9 +1154,9 @@ select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state,b.GRID_NEXTPARTNAME from epdc_item_handle_process b where b.DEL_FLAG = '0' - and b.CREATED_TIME = ( + and b.UPDATED_TIME = ( SELECT - max(CREATED_TIME) + max(UPDATED_TIME) from epdc_item_handle_process where b.ITEM_ID = ITEM_ID and DEL_FLAG = '0'