群发统计

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

@@ -143,7 +143,9 @@
   <select id="listForTimer" resultType="long">
   	  SELECT a.owner_log_id  FROM tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
   	  WHERE b.end_time >= DATE_ADD(NOW(),INTERVAL -12 hour) and a.done_flag = 0  and a.delete_flag = 0  and b.delete_flag = 0 
-  	  and a.plan_id = #{planId}
+  	  <if test="null != planId and -1 != planId">
+	  	  and a.plan_id = #{planId}
+  	  </if>
   </select>
   
   <select id="listPage"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">

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

@@ -143,7 +143,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("detail")
-    public RestResponse<Object> detail(Long planId , @RequestParam(defaultValue="0")int updteFlag) {
+    public RestResponse<Object> detail(Long planId, @RequestParam(defaultValue = "0") int updteFlag) {
         ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
         if (!linkResp.isSuccess()) {
             return RestResponse.failure("1", "计划不存在");
@@ -161,23 +161,24 @@ public class GroupChatPlanController {
         GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class, plan);
         List<MaterialDTO> materials = materialApiService.listMaterialByIds(materialIdList);
         vo.setMaterialIdList(materials);
-        GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO() ;
+        GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(1);
         basePageInfo.setPageSize(10000);
-        ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> ownerResp = this.groupChatPlanApiService.listOwnerLogPage(planId, qdto, basePageInfo) ;
-        if(ownerResp.isSuccess()) {
-            List<GroupChatPlanOwnerLogDTO> list = ownerResp.getResult().getResult() ;
-            if(CollectionUtils.isNotEmpty(list)) {
-                List<ChatOwnerVO> ownerList = list.stream().map(dto->{
+        ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> ownerResp = this.groupChatPlanApiService
+                .listOwnerLogPage(planId, qdto, basePageInfo);
+        if (ownerResp.isSuccess()) {
+            List<GroupChatPlanOwnerLogDTO> list = ownerResp.getResult().getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                List<ChatOwnerVO> ownerList = list.stream().map(dto -> {
                     ChatOwnerVO owner = new ChatOwnerVO();
                     owner.setStaffId(dto.getStaffId());
                     owner.setStaffName(dto.getStaffName());
-                    return owner ;
-                }).collect(Collectors.toList()) ;
+                    return owner;
+                }).collect(Collectors.toList());
                 vo.setOwnerList(ownerList);
             }
         }