diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index b2ec8186f..6de0209d0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -168,6 +168,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemHandleProcessEntity.setItemId(itemEntity.getId()); itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); itemHandleProcessEntity.setHandleAdvice(dto.getAdvice()); + itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice()); itemHandleProcessEntity.setHandlerDeptId(SecurityUser.getDeptId()); itemHandleProcessService.insert(itemHandleProcessEntity); // 插入项目部门关联表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDeptDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDeptDao.java index 0521d51b0..2c11f9c10 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDeptDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDeptDao.java @@ -40,7 +40,7 @@ public interface ItemDeptDao extends BaseDao { * @Author: liuchuang * @Date: 2019/9/16 11:05 */ - List getItemDept(String itemId, Long handerDeptId); + List getItemDept(String itemId, Long createdDeptId); /** * 删除已流转协助部门 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 94ca862b5..75913b658 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 @@ -275,7 +275,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemCirculationDeptResultDTO circulationDeptResultDTO1 = new ItemCirculationDeptResultDTO(); circulationDeptResultDTO1.setDeptId(completeDeptDTO.getStreetId()); circulationDeptResultDTO1.setDeptName(completeDeptDTO.getStreet()); - circulationDeptResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); + circulationDeptResultDTO1.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); circulationDeptResultDTO1.setSelected(false); if (streetSelected) { circulationDeptResultDTO1.setSelected(true); 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 24deb0dab..a1cd833ff 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 @@ -288,7 +288,7 @@ SELECT CREATED_TIME AS createdTime, advice, - ( CASE STATE WHEN 0 THEN '审核通过' WHEN 1 THEN '反馈' WHEN 2 THEN '已关闭' ELSE '' END ) AS stateName + CASE STATE WHEN 0 THEN '审核通过' WHEN 1 THEN '反馈' WHEN 2 THEN '已关闭' ELSE '' END AS progressName FROM epdc_issue_handle WHERE @@ -302,7 +302,7 @@ OUT_HANDLE_ADVICE AS advice, - ( CASE WHEN STATE = 0 THEN '处理中' WHEN STATE = 5 THEN '已关闭' WHEN STATE = 10 THEN '已结案' ELSE '' END ) AS stateName + CASE WHEN STATE = 0 THEN '处理中' WHEN STATE = 5 THEN '已关闭' WHEN STATE = 10 THEN '已结案' ELSE '' END AS progressName FROM epdc_item_handle_process WHERE diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDeptDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDeptDao.xml index 569329fe3..d5f3e7207 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDeptDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDeptDao.xml @@ -20,6 +20,6 @@ WHERE DEL_FLAG = '0' AND ITEM_ID = #{itemId} - AND DEPT_ID ]]> #{gridId} + AND DEPT_ID ]]> #{deptId}