Merge remote-tracking branch 'origin/feature/shenyan_shangbao' into feature/shenyan_shangbao

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -4459,7 +4459,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             // 手动拼接流转协助部门
             ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
             itemCirculationDeptResultDTO.setDeptId(dept.getData().getPid());
-            itemCirculationDeptResultDTO.setDeptName(dept.getData().getParentName());
+            itemCirculationDeptResultDTO.setDeptName("市北区委");
             itemCirculationDeptResultDTO.setSelected(false);
             itemCirculationDeptResultDTO.setTypeKey(dept.getData().getTypeKey());
             List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
@@ -4667,6 +4667,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
             }
             //上报到网格化平台
+            dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_I_HANDLE_DISAGREE.getValue());
             sendItemToDsf(dto, handleProcessEntity);
             //工作端 根据不同的处理方式，进行短信通知
             this.workProjectHandle(dto);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -926,7 +926,6 @@
             and b.HANDLER_DEPT != '网格化平台'
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
-        AND item.evaluation_score = '0'
         and (process.state is not null and process.state in (1002))
         and item.IS_PEOPLE = '1'