修改测试问题

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------------------------------------------------

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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
                 List<Long> 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<ItemCirculationDeptResultDTO> circulationDeptResultDTOS = dto.getDeptResultDTOS();
@@ -566,18 +564,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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);

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