Merge branch 'fixbug-zcy' into 'master'

fix bug 1021309

See merge request rays/pcloud-book!497

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/TaskCompletedBiz.java

@@ -20,7 +20,7 @@ public interface TaskCompletedBiz {
 
     PageBeanNew<TaskItemSendDto> listTaskItemSendRecord4Pcloud(Integer currentPage, Integer numPerPage, String startTime, String endTime, String robotWxId, String taskName, String sendContent, String search);
 
-    PageBeanNew<TaskSendUserDto> listTaskItemSendUser4Pcloud(Integer currentPage, Integer numPerPage, Integer taskItemId, String search, String robotWxId);
+    PageBeanNew<TaskSendUserDto> listTaskItemSendUser4Pcloud(Integer currentPage, Integer numPerPage, Integer taskItemId, String search, String robotWxId, String startTime, String endTime);
 
     TodayTaskSendDto getTodayTaskSend();
 

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskCompletedBizImpl.java

@@ -206,7 +206,7 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
     }
 
     @Override
-    public PageBeanNew<TaskSendUserDto> listTaskItemSendUser4Pcloud(Integer currentPage, Integer numPerPage, Integer taskItemId, String search, String robotWxId) {
+    public PageBeanNew<TaskSendUserDto> listTaskItemSendUser4Pcloud(Integer currentPage, Integer numPerPage, Integer taskItemId, String search, String robotWxId, String startTime, String endTime) {
         List<TaskSendUserDto> list = new ArrayList<>();
         List<String> wxIds = new ArrayList<>();
         if (StringUtil.isNotBlank(search)) {
@@ -215,11 +215,11 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
                 return new PageBeanNew<>(currentPage, numPerPage, 0, list);
             }
         }
-        Integer count = timeControlTaskSendMapper.getTaskItemSendUserCount(wxIds, taskItemId, robotWxId);
+        Integer count = timeControlTaskSendMapper.getTaskItemSendUserCount(wxIds, taskItemId, robotWxId, startTime, endTime);
         if (count <= 0) {
             return new PageBeanNew<>(currentPage, numPerPage, count, list);
         }
-        list = timeControlTaskSendMapper.listTaskItemSendUser4Pcloud(currentPage * numPerPage, numPerPage, wxIds, taskItemId, robotWxId);
+        list = timeControlTaskSendMapper.listTaskItemSendUser4Pcloud(currentPage * numPerPage, numPerPage, wxIds, taskItemId, robotWxId, startTime, endTime);
         if (ListUtils.isEmpty(list)) {
             return new PageBeanNew<>(currentPage, numPerPage, count, list);
         }

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/facade/impl/TimeControlStatisFacadeImpl.java

@@ -3,17 +3,24 @@ package com.pcloud.book.timecontrol.facade.impl;
 import com.pcloud.book.timecontrol.biz.TaskBiz;
 import com.pcloud.book.timecontrol.biz.TaskCompletedBiz;
 import com.pcloud.book.timecontrol.biz.TaskSubscribeBiz;
-import com.pcloud.book.timecontrol.dto.*;
+import com.pcloud.book.timecontrol.dto.SubscribeTaskUserDTO;
+import com.pcloud.book.timecontrol.dto.TaskCompletedDto;
+import com.pcloud.book.timecontrol.dto.TaskItemSendDto;
+import com.pcloud.book.timecontrol.dto.TaskSendUserDto;
+import com.pcloud.book.timecontrol.dto.TodayTaskSendDto;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
-import com.pcloud.common.utils.cookie.Cookie;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -101,9 +108,10 @@ public class TimeControlStatisFacadeImpl {
                                                                           @RequestParam Integer currentPage,
                                                                           @RequestParam Integer numPerPage,
                                                                           @RequestParam(value = "taskItemId") Integer taskItemId,
-                                                                          @RequestParam(value = "search", required = false) String search, @RequestParam String robotWxId) throws PermissionException {
+                                                                          @RequestParam(value = "search", required = false) String search, @RequestParam String robotWxId,
+                                                                          @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) throws PermissionException {
         SessionUtil.getToken4Redis(token);
-        PageBeanNew<TaskSendUserDto> pageResult = taskCompletedBiz.listTaskItemSendUser4Pcloud(currentPage, numPerPage,taskItemId,search, robotWxId);
+        PageBeanNew<TaskSendUserDto> pageResult = taskCompletedBiz.listTaskItemSendUser4Pcloud(currentPage, numPerPage,taskItemId,search, robotWxId, startTime, endTime);
         return new ResponseDto<>(pageResult);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/mapper/TimeControlTaskSendMapper.java

@@ -51,9 +51,11 @@ public interface TimeControlTaskSendMapper {
 
     List<TaskItemSendDto> listTaskItemSendRecord4Pcloud(@Param("pageNum") Integer pageNum, @Param("numPerPage") Integer numPerPage, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("robotWxId") String robotWxId, @Param("taskName") String taskName, @Param("sendContent") String sendContent);
 
-    Integer getTaskItemSendUserCount(@Param("wxIds") List<String> wxIds,@Param("taskItemId") Integer taskItemId, @Param("robotWxId") String robotWxId);
+    Integer getTaskItemSendUserCount(@Param("wxIds") List<String> wxIds,@Param("taskItemId") Integer taskItemId, @Param("robotWxId") String robotWxId,
+                                     @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<TaskSendUserDto> listTaskItemSendUser4Pcloud(@Param("pageNum") Integer pageNum, @Param("numPerPage") Integer numPerPage,@Param("wxIds") List<String> wxIds, @Param("taskItemId") Integer taskItemId, @Param("robotWxId") String robotWxId);
+    List<TaskSendUserDto> listTaskItemSendUser4Pcloud(@Param("pageNum") Integer pageNum, @Param("numPerPage") Integer numPerPage,@Param("wxIds") List<String> wxIds, @Param("taskItemId") Integer taskItemId, @Param("robotWxId") String robotWxId,
+                                                      @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<SubscribeTaskUserDTO> getTaskNoCompletedCount(@Param("wxIds") List<String> wxIds, @Param("taskId") Integer taskId);
 

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskSendMapper.xml

@@ -185,6 +185,12 @@
           </foreach>
       </if>
     and a.task_item_id=#{taskItemId} AND b.robot_Wx_id = #{robotWxId}
+    <if test="startTime !=null">
+      and a.send_day <![CDATA[ >= ]]> STR_TO_DATE(#{startTime},'%Y-%m-%d')
+    </if>
+    <if test="endTime !=null">
+      and a.send_day <![CDATA[ <= ]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
+    </if>
   </select>
 
   <select id="listTaskItemSendUser4Pcloud" resultType="com.pcloud.book.timecontrol.dto.TaskSendUserDto">
@@ -203,6 +209,12 @@
           </foreach>
       </if>
     and a.task_item_id=#{taskItemId} AND b.robot_wx_id = #{robotWxId}
+    <if test="startTime !=null">
+      and a.send_day <![CDATA[ >= ]]> STR_TO_DATE(#{startTime},'%Y-%m-%d')
+    </if>
+    <if test="endTime !=null">
+      and a.send_day <![CDATA[ <= ]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
+    </if>
     <if test="pageNum != null">
       limit #{pageNum}, #{numPerPage}
     </if>