From e9e88eefcc8abd2b1e187d28c7666e80307e97cc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 五月 2026 14:59:33 +0800
Subject: [PATCH] 不合格处理：切换新的OA流程
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 63619a2..aef9f1f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -60,15 +61,14 @@
//鏌ヨ寰呮椤圭洰
@Override
- public IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
+ public IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids) {
List<Integer> noIds = null;
if (StringUtils.isNotBlank(ids)) {
- noIds = Arrays.asList(ids.split(",")).stream()
+ noIds = Arrays.stream(ids.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
}
- IPage<InsProduct> insProductIPage = baseMapper.selectNoProducts(page, orderId, noIds);
- return insProductIPage;
+ return baseMapper.selectNoProducts(page, orderId, noIds);
}
//瀹℃牳寰呮鎾ら攢
@@ -134,7 +134,8 @@
product.setTemplate(null);
product.setStyle(null);
return product;
- }).collect(Collectors.toList());
+ }).sorted((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
+ - (o2.getSort() == null ? 0 : o2.getSort())).collect(Collectors.toList());
return insProducts;
}
--
Gitblit v1.9.3