From 75f88faf6f35fba3e9561f1d1fc2fa5715a6734f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 24 Oct 2022 15:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 d1685fb47..56b983b2d 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 @@ -3830,7 +3830,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem //1.handle表字段赋值 itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue()); itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); + itemHandleProcessDto.setGridPartyid(formDto.getGridPartyid()); itemHandleProcessDto.setGridPartyname(formDto.getGridPartyname()); + itemHandleProcessDto.setGridUnitid(formDto.getGridUnitid()); itemHandleProcessDto.setGridTaskcnname("下发评价"); //2.更新主表数据允许评价 ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); @@ -4294,7 +4296,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return; } //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 - if (!"0".equals(entity.getPeopleFlag()) || entity.getEvaluationScore() == 0) { + if (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0)) { //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity(); processEntity.setId(UUID.randomUUID().toString().replaceAll("-", "")); @@ -4327,10 +4329,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem iWrapper.eq("reference_id", hEntity.getId()); iWrapper.eq("del_flag", "0"); List iEntityList = imgDao.selectList(iWrapper); - if (CollUtil.isEmpty(iEntityList)) { - throw new RenException("获取项目流程节点对应的图片数据失败，节点Id->" + hEntity.getId()); - } List imgUrlList = iEntityList.stream().map(ImgEntity::getImgUrl).collect(Collectors.toList()); + AcceptPlantformProcessDTO dto = new AcceptPlantformProcessDTO(); dto.setItemId(itemId); dto.setState("0");