From 20211afe0a116c2b35aa7dcfd0dbd2fe3913b737 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 14 Jun 2025 17:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/controller/ToDoController.java | 13 ++++++++++--- .../sgzb/material/service/impl/ToDoServiceImpl.java | 2 +- .../main/resources/mapper/material/ToDoMapper.xml | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java index aa126618..eaa820bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.material.controller; +import cn.hutool.core.convert.Convert; +import com.bonus.sgzb.common.core.utils.ListPagingUtil; +import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; @@ -13,6 +16,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; +import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; + /** * @description 首页--代办事项 * @author hay @@ -30,11 +36,12 @@ public class ToDoController extends BaseController { */ @ApiOperation(value = "代办事项列表") @GetMapping("/getToDoList") - public TableDataInfo getToDoList(ToDoBean bean) + public AjaxResult getToDoList(ToDoBean bean) { - startPage(); List list = toDoService.getToDoList(bean); - return getDataTable(list); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } @ApiOperation(value = "代办事件下拉") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java index e0aeb38f..b99806e8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java @@ -54,7 +54,7 @@ public class ToDoServiceImpl implements ToDoService { List toDoList = toDoMapper.getToDoList(bean); if (!CollectionUtils.isEmpty(toDoList)) { // 将toDoList集合中领料任务过滤出来，即taskTypeId为29的数据 - List collect = toDoList.stream().filter(toDoBean -> "29".equals(toDoBean.getTaskTypeId())) + List collect = toDoList.stream().filter(toDoBean -> "29".equals(toDoBean.getTaskTypeId()) && toDoBean.getCompanyId() != null) .collect(Collectors.toList()); // 机具经理、副经理 if (roles.contains(STRING_EM01) || roles.contains(STRING_EM02)) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml index 216ed4a0..45117673 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml @@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.`name` as taskEvent, us.nick_name as createName, tt.create_by as createBy, - tt.company_id as companyId, tt.create_time as createTime, lai.company_id as companyId, su.dept_id as deptId,