Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !760

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/ChatHmSearchQDTO.java

@@ -15,14 +15,22 @@ public class ChatHmSearchQDTO extends PageQo implements Serializable {
     private String wxEnterpriseId;
     private String enterpriseId;
     private String searchParams;
+    private String searchParamsCode;
     // 1有效 2作废
-    private Integer status ;
+    private Integer status;
     private Long linkId;
     private List<Long> chatHmIdList;
-    private List<String> creatorIdList ;
-    private Integer linkCount ;
-    private int allFlag ;
-    
+    private List<String> creatorIdList;
+    private Integer linkCount;
+    private int allFlag;
+    public String getSearchParamsCode() {
+        return searchParamsCode;
+    }
+
+    public void setSearchParamsCode(String searchParamsCode) {
+        this.searchParamsCode = searchParamsCode;
+    }
+
     public int getAllFlag() {
         return allFlag;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -83,6 +83,10 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     public Page<GroupChatHmBO> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
         String wxEnterpriseId = qdto.getWxEnterpriseId();
         String enterpriseId = qdto.getEnterpriseId();
+        if(StringUtils.isNotBlank(qdto.getSearchParams())) {
+            qdto.setSearchParams("%"+qdto.getSearchParams()+"%");
+            qdto.setSearchParamsCode(qdto.getSearchParams()+"%");
+        }
         Long linkId = qdto.getLinkId();
         if (null != linkId) {
             // 查询链接下的关联的活码列表

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatPlanApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -100,6 +101,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
+        if(StringUtils.isNotBlank(qdto.getSearchParams())) {
+            qdto.setSearchParams("%"+qdto.getSearchParams()+"%");
+        }
         Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo);
         return ServiceResponse.success(page);
     }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml

@@ -149,7 +149,7 @@
 			and create_time >= #{startDate} and create_time   <![CDATA[<=]]> #{endDate}
 		</if>
 		<if test="null != searchParams and '' !=searchParams ">
-			and ( name like '%${searchParams}%' or chat_hm_code like '${searchParams}%' or creator_name like  '%${searchParams}%' )
+			and ( name like #{searchParams} or chat_hm_code like #{searchParamsCode} or creator_name like  #{searchParams} )
 		</if>
 		<if test="null != status">
 			and status_flag = #{status}

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml

@@ -100,6 +100,6 @@
   	  </if>
   	  <if test="null != startDate">
 			and a.create_time <![CDATA[>=]]>	#{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
-		</if>
+	  </if>
   </select>
 </mapper> 
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -132,6 +132,15 @@
   	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_staff b on a.staff_id = b.staff_id 
   	  where 
   	  	a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and a.delete_flag = 0
+  	  	<if test="null != sendStatus">
+  	  		and send_status = #{sendStatus}
+  	  	</if>
+  	  	<if test="null != searchParams and ''!=searchParams">
+  	  		and b.staff_name like #{searchParams}
+  	  	</if>
+  	  	<if test="null != startDate">
+			and a.create_time <![CDATA[>=]]> #{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
+	    </if>
   	  	order by a.create_time , a.owner_log_id
   </select>