Browse Source

修改测试问题

dev
liuchuang 6 years ago
parent
commit
a18b9675a0
  1. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  3. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

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

@ -247,7 +247,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
Long userId = SecurityUser.getUserId(); Long userId = SecurityUser.getUserId();
// 获取部门信息 // 获取部门信息
Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(deptId); Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(deptId);
if (dtoResult.success()) { if (dtoResult.success() && null != dtoResult.getData()) {
// 网格用户 // 网格用户
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dtoResult.getData().getTypeKey())) { if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dtoResult.getData().getTypeKey())) {
// 议题-待回应 // 议题-待回应

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@ -147,6 +147,7 @@
SELECT SELECT
CREATED_TIME AS createdTime, CREATED_TIME AS createdTime,
advice, advice,
HANDLER_DEPT AS handlerDept,
( 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 stateName
FROM FROM
epdc_issue_handle epdc_issue_handle
@ -156,6 +157,7 @@
SELECT SELECT
CREATED_TIME AS createdTime, CREATED_TIME AS createdTime,
HANDLE_ADVICE AS advice, HANDLE_ADVICE AS advice,
HANDLER_DEPT AS handlerDept,
( (
CASE CASE

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

@ -318,7 +318,7 @@
<resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO"> <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
<result property="createdTime" column="createdTime"/> <result property="createdTime" column="createdTime"/>
<result property="advice" column="advice"/> <result property="advice" column="advice"/>
<result property="handlerDept" column="HANDLER_DEPT"/> <result property="handlerDept" column="handlerDept"/>
<result property="progressName" column="progressName"/> <result property="progressName" column="progressName"/>
<collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO"> <collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO">
<result property="deptName" column="DEPT_NAME"/> <result property="deptName" column="DEPT_NAME"/>

Loading…
Cancel
Save