待办以及消息

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PendingTaskMapper.java

@@ -48,7 +48,7 @@ public interface PendingTaskMapper {
      * @return
      */
     public List<TabPendingTask> listPendingTask(@Param("enterpriseId") String enterpriseId, @Param("storeId") String storeId, @Param("clerkId") String clerkId,
-                                                @Param("finishFlag") int finishFlag, @Param("overdueFlag") int overdueFlag);
+                                                @Param("taskType") int taskType, @Param("finishFlag") int finishFlag, @Param("overdueFlag") int overdueFlag);
 
     /**
      * 分页查询待办任务表

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java

@@ -31,7 +31,7 @@ public interface PendingTaskService {
      * @param pageInfo     分页参数
      * @return
      */
-    public Page<PendingTaskBO> pagePendingTask(String enterpriseId, String storeId, String clerkId,
+    public Page<PendingTaskBO> pagePendingTask(String enterpriseId, String storeId, String clerkId, int taskType,
                                                int finishFlag, int overdueFlag, BasePageInfo pageInfo);
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java

@@ -42,9 +42,9 @@ public class PendingTaskServiceImpl implements PendingTaskService {
     }
 
     @Override
-    public Page<PendingTaskBO> pagePendingTask(String enterpriseId, String storeId, String clerkId, int finishFlag, int overdueFlag, BasePageInfo pageInfo) {
+    public Page<PendingTaskBO> pagePendingTask(String enterpriseId, String storeId, String clerkId, int taskType, int finishFlag, int overdueFlag, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
-        List<TabPendingTask> tabPendingTasks = pendingTaskMapper.listPendingTask(enterpriseId, storeId, clerkId, finishFlag, overdueFlag);
+        List<TabPendingTask> tabPendingTasks = pendingTaskMapper.listPendingTask(enterpriseId, storeId, clerkId, taskType, finishFlag, overdueFlag);
         Page<PendingTaskBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(tabPendingTasks, PendingTaskBO.class);
         return retPage;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -43,7 +43,8 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
 
     @Override
     public ServiceResponse<Page<PendingTaskDetailDTO>> pagePendingTask(PendingListQDTO listQDTO, BasePageInfo pageInfo) {
-        Page<PendingTaskBO> pendingTask = pendingTaskService.pagePendingTask(listQDTO.getEnterpriseId(), listQDTO.getStoreId(), listQDTO.getClerkId(), listQDTO.getFinishFlag()
+        Page<PendingTaskBO> pendingTask = pendingTaskService.pagePendingTask(listQDTO.getEnterpriseId(), listQDTO.getStoreId()
+                , listQDTO.getClerkId(), listQDTO.getTaskType(), listQDTO.getFinishFlag()
                 , listQDTO.getOverdueFlag(), pageInfo);
         //转化
         Page<PendingTaskDetailDTO> retPage = PageHelperUtils.changePageToCurrentPage(pendingTask, PendingTaskDetailDTO.class);
@@ -55,7 +56,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
     }
 
     /**
-     * 组装
+     * 组装 防止后面变更需求
      *
      * @param list
      */

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -254,6 +254,9 @@
         <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
+        <if test="taskType != null">
+            and task_type = #{taskType}
+        </if>
         order by overdue_time desc
     </select>