Browse Source

放开 下方评价及其驳回的限制。

master
qushutong 2 years ago
parent
commit
9666d29d51
  1. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  2. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

5
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<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params){
return itemService.getItemList(params);
log.info("产品调用"+params.toString());
Result<List<ItemToEpmetDTO>> itemList = itemService.getItemList(params);
log.info("产品调用返回"+itemList.toString());
return itemList;
}
}

10
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<ItemDao, ItemEntity> 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("-", ""));

4
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'

Loading…
Cancel
Save