群群发列表查询

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

@@ -28,7 +28,17 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private List<String> creatorIdList ;
     private String wxChatId;
     private String searchClerkId ;
-    
+    // clerkTaskStatus  1待处理    2已处理/已失效
+    private int clerkTaskStatus ;
+
+    public int getClerkTaskStatus() {
+        return clerkTaskStatus;
+    }
+
+    public void setClerkTaskStatus(int clerkTaskStatus) {
+        this.clerkTaskStatus = clerkTaskStatus;
+    }
+
     public String getSearchClerkId() {
         return searchClerkId;
     }

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

@@ -170,7 +170,12 @@
   	  	<if test="null != searchParams">
   	  		and b.name like #{searchParams}
   	  	</if>
-  	  	and b.end_time > now() 
+  	    <if test="1==clerkTaskStatus">
+			and b.end_time > now()
+		</if>
+  	    <if test="2==clerkTaskStatus">
+			and b.end_time <![CDATA[<=]]> now()
+		</if>
   	  	group by b.plan_id
   	  	having notSendCount 
   	  	order by b.end_time desc ,  a.create_time desc

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONArray;
@@ -44,9 +45,10 @@ public class GroupChatPlanController {
     @Autowired
     private MaterialApiService materialApiService;
 
+    // clerkTaskStatus  1待处理    2已处理/已失效
     @RequestMapping("total-list")
     public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
-            String searchParams, BasePageInfo basePageInfo) {
+            String searchParams, BasePageInfo basePageInfo , @RequestParam(defaultValue = "1") int clerkTaskStatus) {
         if (StringUtils.isEmpty(clerkId)) {
             return RestResponse.failure("1", "clerkId为空");
         }
@@ -57,6 +59,7 @@ public class GroupChatPlanController {
         if (StringUtils.isNotBlank(searchParams)) {
             qdto.setSearchParams("%" + searchParams + "%");
         }
+        qdto.setClerkTaskStatus(clerkTaskStatus);
         ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
                 .listOwnerLogPageForWxaTotal(qdto, basePageInfo);
         Page<ChatOwnerTotalDTO> page = pageResp.getResult();