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

Feature/社群

See merge request !635

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

 package com.gic.haoban.manage.api.dto.chat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -21,13 +22,15 @@ public class ChatOwnerTotalDTO implements Serializable {
     private java.util.Date endTime;
     private int sendCount;
     private int notSendCount;
-    
     // 计划状态 1进行中 2已结束
+    private int planStatus;
+
     public int getPlanStatus() {
-        if (this.getEndTime().before(endTime)) {
-            return 1;
+        return planStatus;
     }
-        return 2;
+
+    public void setPlanStatus(int planStatus) {
+        this.planStatus = planStatus;
     }
 
     public Long getPlanId() {

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java

@@ -39,6 +39,9 @@ public interface HmLinkApiService {
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType);
     
+    public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
+            Integer linkType,List<String> creatorIdList);
+
     public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
     public ServiceResponse<String> save(HmLinkDTO dto);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java

@@ -54,7 +54,7 @@ public interface HmLinkMapper {
 
     public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName,
-            @Param("linkType") Integer linkType);
+            @Param("linkType") Integer linkType, @Param("creatorIdList") List<String> creatorIdList);
 
     public List<TabHmLink> list(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("enterpriseId") String enterpriseId, @Param("startDate") Date startDate,

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java

@@ -19,7 +19,7 @@ public interface HmLinkService {
 
     public HmLinkBO getByLinkIdFormCache(String wxEnterpriseId, String enterprieId, Long linkId);
 
-    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType);
+    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType,List<String> creatorIdList);
 
     public String saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> stoerList);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -104,8 +104,8 @@ public class HmLinkServiceImpl implements HmLinkService {
     }
     
     @Override
-    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
-        List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName, linkType);
+    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType,List<String> creatorIdList) {
+        List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName, linkType,creatorIdList);
         return EntityUtil.changeEntityListByJSON(HmLinkBO.class, list);
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -161,7 +161,13 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     @Override
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType) {
-        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType);
+        return this.listForSms(wxEnterpriseId, enterprieId, linkName, linkType,null);
+    }
+    
+    @Override
+    public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
+            Integer linkType, List<String> creatorIdList) {
+        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType,creatorIdList);
         List<HmLinkDTO> retList = EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
         return ServiceResponse.success(retList);
     }

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml

@@ -127,6 +127,12 @@
   	<if test="null != linkType">
   		and link_type = #{linkType}
   	</if>
+  	<if test="null != creatorIdList and creatorIdList.size>0">
+  		and creator_id in 
+  		<foreach collection="creatorIdList" open="(" close=")" index="index" item="id" separator=",">
+			#{id}  			
+  		</foreach>
+  	</if>
   	and status_flag = 1 order by create_time desc
   	limit 20
   </select>