朋友圈

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.gic.commons.util.DateUtil;
 import com.gic.haoban.manage.api.dto.CommonMQDTO;
 import com.gic.haoban.manage.api.dto.chat.*;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
@@ -62,7 +63,7 @@ public class GroupChatPlanController {
     @RequestMapping("total-list")
     public RestResponse<Page<ChatOwnerTotalDTO>> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
             String searchParams, BasePageInfo basePageInfo , @RequestParam(defaultValue = "1") int clerkTaskStatus , String storeId ,
-                                                            Date startDate ,  Date endDate ) {
+                                                            String startDate ,  String endDate ) {
         if (StringUtils.isEmpty(clerkId)) {
             return RestResponse.failure("1", "clerkId为空");
         }
@@ -74,8 +75,17 @@ public class GroupChatPlanController {
         if (StringUtils.isNotBlank(searchParams)) {
             qdto.setSearchParams("%" + searchParams + "%");
         }
-        qdto.setStartDate(startDate);
-        qdto.setEndDate(endDate);
+        Date _startDate = null ;
+        Date _endDate = null;
+        if(null != startDate) {
+            _startDate = DateUtil.strToDate(startDate,"yyyy-MM-dd") ;
+        }
+        if(null != endDate) {
+            _endDate = DateUtil.strToDate(endDate,"yyyy-MM-dd") ;
+            _endDate = DateUtil.getEndTimeOfDay(_endDate) ;
+        }
+        qdto.setStartDate(_startDate);
+        qdto.setEndDate(_endDate);
         qdto.setClerkTaskStatus(clerkTaskStatus);
         ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
                 .listOwnerLogPageForWxaTotal(qdto, basePageInfo);