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

Feature/社群

See merge request !633

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

@@ -15,7 +15,7 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private String searchParams;
     // 1进行中、2未开始、3已结束
     private Integer status;
-    // 群主 1待发送 2已发送
+    // 群主 0发送失败 1待发送 2已发送
     private Integer sendStatus ; 
     // 群名称
     private String chatName ;

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

@@ -272,11 +272,15 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
                 int failCount = 0;
                 for (QywxSendMessageResultDTO item : list) {
                     TabGroupChatPlanLog entity = new TabGroupChatPlanLog();
-                    if (item.getStatus() == 2) {
+                    // 企微返回成功
+                    // 0-未发送 1-已发送 2-因客户不是好友导致发送失败 3-因客户已经收到其他群发消息导致发送失败
+                    if (item.getStatus() == 1) {
                         sendCount++;
+                        // 已发送
                         entity.setSendStatus(2);
                     } else {
                         failCount++;
+                        // 发送失败
                         entity.setSendStatus(0);
                     }
                     String wxChatId = item.getChatId();

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

@@ -83,5 +83,17 @@
   	  <if test="null != ownLogId">
   	  	and a.own_log_id = #{ownLogId}
   	  </if>
+  	  <if test="null != searchParams and ''!=searchParams">
+  	  	and c.staff_name like '%${searchParams}%'
+  	  </if>
+  	  <if test="null !=chatName and '' !=chatName">
+  	  	 and (d.name like '%${chatName}%' or d.wx_chat_id like '%${chatName}%')
+  	  </if>
+  	  <if test="null !=sendStatus">
+  	  	and a.send_status = #{sendStatus}
+  	  </if>
+  	  <if test="null != startDate">
+			and a.create_time <![CDATA[>=]]>	#{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
+		</if>
   </select>
 </mapper> 
\ No newline at end of file