bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-06-14 17:48:18 +08:00
parent 4eb0d03dea
commit 20211afe0a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller; 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.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.core.web.page.TableDataInfo;
@ -13,6 +16,9 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; 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 首页--代办事项 * @description 首页--代办事项
* @author hay * @author hay
@ -30,11 +36,12 @@ public class ToDoController extends BaseController {
*/ */
@ApiOperation(value = "代办事项列表") @ApiOperation(value = "代办事项列表")
@GetMapping("/getToDoList") @GetMapping("/getToDoList")
public TableDataInfo getToDoList(ToDoBean bean) public AjaxResult getToDoList(ToDoBean bean)
{ {
startPage();
List<ToDoBean> list = toDoService.getToDoList(bean); List<ToDoBean> 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 = "代办事件下拉") @ApiOperation(value = "代办事件下拉")

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java
View File

@ -54,7 +54,7 @@ public class ToDoServiceImpl implements ToDoService {
List<ToDoBean> toDoList = toDoMapper.getToDoList(bean); List<ToDoBean> toDoList = toDoMapper.getToDoList(bean);
if (!CollectionUtils.isEmpty(toDoList)) { if (!CollectionUtils.isEmpty(toDoList)) {
// 将toDoList集合中领料任务过滤出来，即taskTypeId为29的数据 // 将toDoList集合中领料任务过滤出来，即taskTypeId为29的数据
List<ToDoBean> collect = toDoList.stream().filter(toDoBean -> "29".equals(toDoBean.getTaskTypeId())) List<ToDoBean> collect = toDoList.stream().filter(toDoBean -> "29".equals(toDoBean.getTaskTypeId()) && toDoBean.getCompanyId() != null)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 机具经理、副经理 // 机具经理、副经理
if (roles.contains(STRING_EM01) || roles.contains(STRING_EM02)) { if (roles.contains(STRING_EM01) || roles.contains(STRING_EM02)) {

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.`name` as taskEvent, sd.`name` as taskEvent,
us.nick_name as createName, us.nick_name as createName,
tt.create_by as createBy, tt.create_by as createBy,
tt.company_id as companyId,
tt.create_time as createTime, tt.create_time as createTime,
lai.company_id as companyId, lai.company_id as companyId,
su.dept_id as deptId, su.dept_id as deptId,