From 2778c77cef66e5e6c19bc93e4c5db557591ea089 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 三月 2024 16:09:25 +0800
Subject: [PATCH] 业务管理：检验任务修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index df03b38..01011d2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -11,6 +11,7 @@
import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -34,15 +35,18 @@
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) {
+ //鍒濆鍖杙age
Page<InsOrder> insOrderPage = new Page<>();
insOrderPage.setCurrent(page.getCurrent());
insOrderPage.setPages(page.getPages());
insOrderPage.setSize(page.getSize());
Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(InsOrder.class));
+ //鑾峰彇琛ㄥご
+ map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderPlanList");
Integer userId = map1.get("userId");
if (map1.get("look") == 1) insOrder.setCreateUser(userId);
+ //鏌ヨ
List<InsOrder> orderPage = insOrderMapper.selectList(QueryWrappers.queryWrappers(insOrder));
List<InsOrder> filterData = orderPage.stream().filter(order -> {
List<InsOrderUser> insOrderUsers = insOrderUserMapper.selectList(Wrappers.<InsOrderUser>lambdaQuery()
@@ -50,6 +54,7 @@
boolean isZero = insOrderUsers.stream().noneMatch(iou -> iou.getUserId().equals(userId));
return insOrderUsers.isEmpty() || !isZero;
}).collect(Collectors.toList());
+ insOrderPage.setRecords(filterData);
insOrderPage.setTotal(filterData.size());
map.put("body", insOrderPage);
return map;
--
Gitblit v1.9.3