From 45c4072aba95e1ff3dd5abdcb0d13898fbb636e6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 Oct 2022 18:52:58 +0800 Subject: [PATCH 1/3] 121 --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 c35bf5976..2b6dffbde 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 @@ -4670,6 +4670,7 @@ public class ItemServiceImpl extends BaseServiceImpl 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); From 598199948f83b2d42ef968900c6364d5e1bc562a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 25 Oct 2022 19:17:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=88=E9=AA=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 957cbfb04..4b3ce3cbd 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/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' From d7a9dca68d9ba17e764519f5d930c5f77d441b08 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 Oct 2022 19:17:50 +0800 Subject: [PATCH 3/3] 11 --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2b6dffbde..26b31f1b0 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 @@ -4462,7 +4462,7 @@ public class ItemServiceImpl extends BaseServiceImpl 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 deptList = new ArrayList<>();