待办清单优化

src/main/java/com/zhgd/jeecg/common/util/PageUtil.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.basicdata.vo.PageVo;
 import lombok.experimental.UtilityClass;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -91,4 +92,37 @@ public class PageUtil {
         BeanUtil.copyProperties(source, result);
         return result;
     }
+
+    public Page getPages(Integer currentPage, Integer pageSize, List list) {
+        Page page = new Page();
+        if(list==null){
+            return  null;
+        }
+        int size = list.size();
+
+//        if(pageSize > size) {
+//            pageSize = size;
+//        }
+        if (pageSize!=0){
+            // 求出最大页数，防止currentPage越界
+            int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+
+            if(currentPage > maxPage) {
+                currentPage = maxPage;
+            }
+        }
+        // 当前页第一条数据的下标
+        int curIdx = currentPage > 1 ? (currentPage - 1) * pageSize : 0;
+
+        List pageList = new ArrayList();
+
+        // 将当前页的数据放进pageList
+        for(int i = 0; i < pageSize && curIdx + i < size; i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+
+        page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
+        return page;
+    }
+
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java

@@ -2,11 +2,14 @@ package com.zhgd.xmgl.modules.basicdata.controller.admin;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qiwenshare.common.result.RestResult;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.constant.CommonConstant;
+import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.mybatis.Aes;
 import com.zhgd.xmgl.modules.basicdata.dto.SystemUserAuthDto;
 import com.zhgd.xmgl.modules.basicdata.entity.*;
@@ -286,8 +289,8 @@ public class SystemUserAuthController {
 	private IInspectRecordService inspectRecordService;
 
 	@Operation(summary = "获取用户代办事项", description = "验证token的有效性", tags = {"user"})
-	@GetMapping("/getToDoItems")
+	@PostMapping("/getToDoItems")
-	public RestResult<List<Map<String, Object>>> getToDoItems() {
+	public Result<Page<Map<String, Object>>> getToDoItems(@RequestBody Map<String, Object> param) {
 		List<Map<String, Object>> listMap = new ArrayList<>();
 		SecurityUser user = SecurityUtil.getUser();
 		Set<String> actionCodes = new HashSet<>();
@@ -312,7 +315,7 @@ public class SystemUserAuthController {
 				Map<String, Object> map = new HashMap<>();
 				map.put("flag", 1);
 				map.put("type", "质量管理初审");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -327,7 +330,7 @@ public class SystemUserAuthController {
 				Map<String, Object> map = new HashMap<>();
 				map.put("flag", 1);
 				map.put("type", "质量管理终审");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -343,7 +346,7 @@ public class SystemUserAuthController {
 				map.put("projectSn", inspectRecord.getEngineeringSn());
 				map.put("flag", 1);
 				map.put("type", "质量问题整改");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -359,7 +362,7 @@ public class SystemUserAuthController {
 				map.put("projectSn", inspectRecord.getEngineeringSn());
 				map.put("flag", 2);
 				map.put("type", "安全管理初审");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -375,7 +378,7 @@ public class SystemUserAuthController {
 				map.put("projectSn", inspectRecord.getEngineeringSn());
 				map.put("flag", 2);
 				map.put("type", "安全管理终审");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -391,7 +394,7 @@ public class SystemUserAuthController {
 				map.put("projectSn", inspectRecord.getEngineeringSn());
 				map.put("flag", 2);
 				map.put("type", "安全问题整改");
-				map.put("state", inspectRecord.getSlippageState());
+				map.put("state", inspectRecord.getSlippageState() == 3 ? 3 : 1);
 				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(inspectRecord.getEngineeringSn()))
 						.collect(Collectors.toList()).get(0).getEngineeringName());
 				listMap.add(map);
@@ -411,6 +414,20 @@ public class SystemUserAuthController {
 				listMap.add(map);
 			}
 		}
-		return RestResult.success().data(listMap);
+		Integer flag = MapUtils.getInteger(param, "flag");
+		Integer state = MapUtils.getInteger(param, "state");
+		String projectName = MapUtils.getString(param, "projectName");
+		if (null != flag) {
+			listMap = listMap.stream().filter(l -> Integer.parseInt(l.get("flag").toString()) == flag).collect(Collectors.toList());
+		}
+		if (null != state) {
+			listMap = listMap.stream().filter(l -> Integer.parseInt(l.get("state").toString()) == state).collect(Collectors.toList());
+		}
+		if (StringUtils.isNotBlank(projectName)) {
+			listMap = listMap.stream().filter(l -> l.get("projectName").toString().contains(projectName)).collect(Collectors.toList());
+		}
+		int pageNo = Integer.parseInt(param.getOrDefault("pageNo", 1).toString());
+		int pageSize = Integer.parseInt(param.getOrDefault("pageSize", 10).toString());
+		return Result.success(PageUtil.getPages(pageNo, pageSize, listMap));
 	}
 }