diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java index db5b351010..685fd340ad 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -9,8 +9,6 @@ import java.io.Serializable; public class IcMessageListFormDTO implements Serializable { private static final long serialVersionUID = 2697079163476964749L; - //检索内容 - private String content; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = true; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 5a6cc50fb5..93a598b5fc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -12,9 +12,6 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} - - AND message_content like concat('%', #{content}, '%') - diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java index 8897dcf2ec..e9095b546f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -14,6 +14,10 @@ public class IcPartyActListFormDTO implements Serializable { * 签到状态[已签到:signIn 未签到:unSignIn] */ private String signIn; + /** + * 标题内容 模糊检索 + */ + private String topic; //参加活动党组织ID,groupId private String joinOrgId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index df43a30473..9cc9db71b0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -197,6 +197,9 @@ AND ipa.act_type = #{actType} + + AND ipa.topic like concat('%', #{topic}, '%') + ORDER BY ipa.hold_time DESC