计划校验

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

@@ -29,11 +29,11 @@ import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 
 /**
  * 
-* @ClassName: GroupChatPlanController
-* @Description: 群群发计划
-* @author xugh
-* @date 2022年11月26日 上午9:32:56
-*
+ * @ClassName: GroupChatPlanController
+ * @Description: 群群发计划
+ * @author xugh
+ * @date 2022年11月26日 上午9:32:56
+ *
  */
 @RestController
 @RequestMapping("/chat/plan")
@@ -47,23 +47,23 @@ public class GroupChatPlanController {
     private MaterialApiService materialApiService;
 
     @RequestMapping("total-list")
-    public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,String searchParams ,
-            BasePageInfo basePageInfo) {
+    public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
+            String searchParams, BasePageInfo basePageInfo) {
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
-        if(StringUtils.isNotBlank(searchParams)) {
+        if (StringUtils.isNotBlank(searchParams)) {
             qdto.setSearchParams(searchParams);
         }
-        ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService.listOwnerLogPageForWxaTotal(qdto,
-                basePageInfo);
-        Page<ChatOwnerTotalDTO> page =  pageResp.getResult() ;
-        if(null != page.getResult()) {
-            page.getResult().forEach(dto->{
-                if(dto.getEndTime().before(new Date())) {
+        ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
+                .listOwnerLogPageForWxaTotal(qdto, basePageInfo);
+        Page<ChatOwnerTotalDTO> page = pageResp.getResult();
+        if (null != page.getResult()) {
+            page.getResult().forEach(dto -> {
+                if (dto.getEndTime().before(new Date())) {
                     dto.setPlanStatus(2);
-                }else {
+                } else {
                     dto.setPlanStatus(1);
                 }
             });
@@ -87,7 +87,7 @@ public class GroupChatPlanController {
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long planId) {
         ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
-        if (!linkResp.isSuccess()) {
+        if (!linkResp.isSuccess() || null == linkResp.getResult()) {
             return RestResponse.failure("1", "计划不存在");
         }
         GroupChatPlanDTO plan = linkResp.getResult();