诉求初验和诉求终验接口

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<ItemDao, ItemEntity> implem
         if (!"street_party".equals(dept.getData().getTypeKey())) {
             throw new RenException("当前处理层级不是街道级");
         }
-        LambdaQueryWrapper<ItemCommentFeedbackEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ItemCommentFeedbackEntity::getItemId, formDTO.getId());
-        wrapper.orderByDesc(ItemCommentFeedbackEntity::getCreatedTime);
-        List<ItemCommentFeedbackEntity> 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<ItemDao, ItemEntity> implem
             if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
                 handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
             }
-            handleProcessEntity.setHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setHandleAdvice(handleAdvice);
-            handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setOutHandleAdvice(handleAdvice);
             handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue());
             itemHandleProcessService.insert(handleProcessEntity);
             // 删除已流转协助部门
@@ -4546,8 +4537,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
                 handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
             }
-            handleProcessEntity.setHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setHandleAdvice(handleAdvice);
-            handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setOutHandleAdvice(handleAdvice);
             handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_DISAGREE.getValue());
             itemHandleProcessService.insert(handleProcessEntity);
             //上报
@@ -4592,15 +4583,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (!"district_party".equals(dept.getData().getTypeKey())) {
             throw new RenException("当前处理层级不是区级");
         }
-        LambdaQueryWrapper<ItemCommentFeedbackEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ItemCommentFeedbackEntity::getItemId, formDTO.getId());
-        wrapper.orderByDesc(ItemCommentFeedbackEntity::getCreatedTime);
-        List<ItemCommentFeedbackEntity> 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<ItemDao, ItemEntity> implem
                 handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
             }
 
-            handleProcessEntity.setHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setHandleAdvice(handleAdvice);
-            handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setOutHandleAdvice(handleAdvice);
             handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue());
             itemHandleProcessService.insert(handleProcessEntity);
 
@@ -4646,8 +4628,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
                 handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
             }
-            handleProcessEntity.setHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setHandleAdvice(handleAdvice);
-            handleProcessEntity.setOutHandleAdvice(handleAdvice.concat(content));
+            handleProcessEntity.setOutHandleAdvice(handleAdvice);
             handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_UN_AGREE.getValue());
             itemHandleProcessService.insert(handleProcessEntity);
         }