From 833b53f323b66b8f115192fe3fe1f3ecaef01691 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 28 Nov 2019 17:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../branch/dev_1118/db/esua_epdc_events.sql | 8 ++++++++ .../item/service/impl/ItemServiceImpl.java | 20 ++++--------------- .../main/resources/mapper/issue/IssueDao.xml | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql index 512307c15..fa473c077 100644 --- a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql +++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql @@ -33,6 +33,7 @@ CREATE TABLE `epdc_category` ( `category_code` varchar(255) DEFAULT NULL COMMENT '分类编码', `category_type` varchar(50) DEFAULT NULL COMMENT '分类类别', `sort` int(10) unsigned DEFAULT NULL COMMENT '排序', + `select_flag` tinyint(1) unsigned DEFAULT NULL COMMENT '是否必选：0-否，1-是', `del_flag` tinyint(4) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', `creator` bigint(20) DEFAULT NULL COMMENT '创建者', `create_date` datetime DEFAULT NULL COMMENT '创建时间', @@ -111,3 +112,10 @@ ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `ISSUE_CATEGORY_ID`; ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; ------------------------------------------2019-11-27------------------------------------------------ + +------------------------------------------2019-11-28------------------------------------------------ + +ALTER TABLE esua_epdc_events.epdc_issue_handle ADD GROUP_NAME VARCHAR(128) NULL COMMENT '社群名称'; +ALTER TABLE esua_epdc_events.epdc_issue_handle ADD MOBILE VARCHAR(20) NULL COMMENT '手机号'; + +------------------------------------------2019-11-28------------------------------------------------ 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 56f308009..f93f3da41 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 @@ -516,6 +516,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); handleProcessEntity.setHandlerDeptId(user.getDeptId()); handleProcessEntity.setHandlerDept(user.getDeptName()); + handleProcessEntity.setItemId(dto.getId()); + handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); + handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); + handleProcessEntity.setHandlerDeptId(user.getDeptId()); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { // 项目流转校验 @@ -529,12 +533,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId()); // 删除已流转协助部门 itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId()); - // 记录处理记录 - handleProcessEntity.setItemId(dto.getId()); - handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); - handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - handleProcessEntity.setHandlerDeptId(user.getDeptId()); - itemHandleProcessService.insert(handleProcessEntity); // 新增流转协助部门 itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto, handleProcessEntity.getId()); List circulationDeptResultDTOS = dto.getDeptResultDTOS(); @@ -566,18 +564,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId()); } } - // 记录处理记录 - handleProcessEntity.setItemId(dto.getId()); - handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); - handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - handleProcessEntity.setHandlerDeptId(user.getDeptId()); - itemHandleProcessService.insert(handleProcessEntity); } // 记录处理记录 - handleProcessEntity.setItemId(dto.getId()); - handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); - handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - handleProcessEntity.setHandlerDeptId(user.getDeptId()); itemHandleProcessService.insert(handleProcessEntity); //插入部门响应表 deptRespondTask.saveItemDeptRespond(dto); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 80637754e..0c023ef1a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -110,7 +110,7 @@ i.ISSUE_ADDRESS, i.ISSUE_LATITUDE, i.ISSUE_LONGITUDE, - item.CATEGORY_FULL_NAME as CATEGORY_NAME, + i.CATEGORY_FULL_NAME as CATEGORY_NAME, i.ALL_DEPT_NAMES, i.GROUP_NAME FROM