diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java index 623a396ec..97e8ddfd6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.constant; /** * 事件、议题、项目状态常量 + * * @Author LC * @Date 2019/9/5 9:14 */ @@ -39,24 +40,24 @@ public interface EventIssueItemState { /** * 项目-关闭 */ - int ITEM_CLOSED= 5; + int ITEM_CLOSED = 5; /** * 项目-结案 */ - int ITEM_CLOSEING_CASE= 10; + int ITEM_CLOSEING_CASE = 10; /** * 议题处理-审核通过 */ - int ISSUE_HANDLED_PASS= 0; + int ISSUE_HANDLED_PASS = 0; /** * 议题处理-反馈 */ - int ISSUE_HANDLED_FEEDBACK= 1; + int ISSUE_HANDLED_FEEDBACK = 1; /** * 议题处理-关闭 */ - int ISSUE_HANDLED_CLOSED= 2; + int ISSUE_HANDLED_CLOSED = 2; /** * 事件状态字段 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java index ee51e603a..943521ccc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java @@ -21,9 +21,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dto.item.ItemGridPlatformDTO; import com.elink.esua.epdc.dto.item.result.ActReplyResultDTO; import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao; 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 bc86d68db..fcf73bea7 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 @@ -2208,6 +2208,9 @@ and i.MOBILE = #{mobile} + + and i.NICK_NAME = #{nickName} + and i.ITEM_CONTENT like '%${itemContent}%' @@ -2306,6 +2309,9 @@ and i.MOBILE = #{mobile} + + and i.NICK_NAME = #{nickName} + and i.ITEM_CONTENT like '%${itemContent}%'