群发

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

@@ -165,7 +165,7 @@
   		b.plan_id   planId   ,
   	 	b.name      planName ,
   	 	b.start_time  startTime , 
-  	 	b.end_time    end_time , 
+  	 	b.end_time    endTime , 
   	 	<!-- 已发送 -->
   	 	SUM(CASE a.send_status WHEN 2 THEN 1 ELSE 0 END ) sendCount,
   	 	<!-- 待发送 -->

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

 package com.gic.haoban.manage.web.controller.haoban;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,9 +52,19 @@ public class GroupChatPlanController {
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
-        ServiceResponse<Page<ChatOwnerTotalDTO>> page = this.groupChatPlanApiService.listOwnerLogPageForWxaTotal(qdto,
+        ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService.listOwnerLogPageForWxaTotal(qdto,
                 basePageInfo);
-        return RestResponse.successResult(page.getResult());
+        Page<ChatOwnerTotalDTO> page =  pageResp.getResult() ;
+        if(null != page.getResult()) {
+            page.getResult().forEach(dto->{
+                if(dto.getEndTime().before(new Date())) {
+                    dto.setPlanStatus(1);
+                }else {
+                    dto.setPlanStatus(2);
+                }
+            });
+        }
+        return RestResponse.successResult(page);
     }
 
     @RequestMapping("owner-list")