待办-今日待办

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/qdto/PendingListQDTO.java

@@ -24,11 +24,11 @@ public class PendingListQDTO implements Serializable {
     /**
      * 是否完成 0否 1是
      */
-    private Integer finishFlag;
+    private Integer finishFlag = -1;
     /**
      * 是否逾期 1是 0否
      */
-    private Integer overdueFlag;
+    private Integer overdueFlag = -1;
 
     /**
      * 门店id

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

@@ -251,7 +251,7 @@
         <if test="overdueFlag != -1">
             and overdue_flag = #{overdue_flag}
         </if>
-        <if test="clerkId != -1">
+        <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
         order by overdue_time desc

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

@@ -45,6 +45,11 @@ public class NotifyController extends WebBaseController {
     @RequestMapping("/commission/list")
     public RestResponse pendingList(@RequestBody @Valid PendingListQO qo) {
         PendingListQDTO pendingListQDTO = EntityUtil.changeEntityByOrika(PendingListQDTO.class, qo);
+        pendingListQDTO.setFinishFlag(0);
+        pendingListQDTO.setOverdueFlag(-1);
+        if (qo.getFilterStatus() == 1) {
+            pendingListQDTO.setOverdueFlag(1);
+        }
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
         return RestResponse.success(retPage.getResult());
     }