From 9f64e2758a27ca6e4c28e235629460774e68a5dc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Oct 2022 12:06:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E5=88=9D=E9=AA=8C=E5=92=8C?= =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=BB=88=E9=AA=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 34 +++++-------------- 1 file changed, 8 insertions(+), 26 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 9d78a4a6f..a9fdfbb02 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 @@ -4494,15 +4494,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (!"street_party".equals(dept.getData().getTypeKey())) { throw new RenException("当前处理层级不是街道级"); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ItemCommentFeedbackEntity::getItemId, formDTO.getId()); - wrapper.orderByDesc(ItemCommentFeedbackEntity::getCreatedTime); - List iEntityList = itemCommentFeedbackDao.selectList(wrapper); - String content = ""; - if (CollectionUtils.isNotEmpty(iEntityList)) { - content = "内容：".concat(iEntityList.get(0).getContent()).concat("\n") - .concat("手机号：").concat(iEntityList.get(0).getMobile()); - } ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); handleProcessEntity.setHandlerDeptId(deptId); @@ -4516,8 +4507,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) { handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice()); } - handleProcessEntity.setHandleAdvice(handleAdvice.concat(content)); - handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content)); + handleProcessEntity.setHandleAdvice(handleAdvice); + handleProcessEntity.setOutHandleAdvice(handleAdvice); handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue()); itemHandleProcessService.insert(handleProcessEntity); // 删除已流转协助部门 @@ -4546,8 +4537,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) { handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice()); } - handleProcessEntity.setHandleAdvice(handleAdvice.concat(content)); - handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content)); + handleProcessEntity.setHandleAdvice(handleAdvice); + handleProcessEntity.setOutHandleAdvice(handleAdvice); handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_DISAGREE.getValue()); itemHandleProcessService.insert(handleProcessEntity); //上报 @@ -4592,15 +4583,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (!"district_party".equals(dept.getData().getTypeKey())) { throw new RenException("当前处理层级不是区级"); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ItemCommentFeedbackEntity::getItemId, formDTO.getId()); - wrapper.orderByDesc(ItemCommentFeedbackEntity::getCreatedTime); - List iEntityList = itemCommentFeedbackDao.selectList(wrapper); - String content = ""; - if (CollectionUtils.isNotEmpty(iEntityList)) { - content = "内容：".concat(iEntityList.get(0).getContent()).concat("\n") - .concat("手机号：").concat(iEntityList.get(0).getMobile()); - } ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); handleProcessEntity.setHandlerDeptId(deptId); @@ -4614,8 +4596,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice()); } - handleProcessEntity.setHandleAdvice(handleAdvice.concat(content)); - handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content)); + handleProcessEntity.setHandleAdvice(handleAdvice); + handleProcessEntity.setOutHandleAdvice(handleAdvice); handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue()); itemHandleProcessService.insert(handleProcessEntity); @@ -4646,8 +4628,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) { handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice()); } - handleProcessEntity.setHandleAdvice(handleAdvice.concat(content)); - handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content)); + handleProcessEntity.setHandleAdvice(handleAdvice); + handleProcessEntity.setOutHandleAdvice(handleAdvice); handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_UN_AGREE.getValue()); itemHandleProcessService.insert(handleProcessEntity); }