From 8caf5f04be94d8f52fb291dd045663079d681c19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java b/src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java
index b851290..25994e4 100644
--- a/src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/qms/service/impl/InspectionItemServiceImpl.java
@@ -51,4 +51,21 @@
}
return super.getBaseMapper().queryList(pageData,queryWrapper);
}
+
+ @Override
+ public IPage<Map<String, Object>> queryListByPlanId(Integer pageNo, Integer pageSize, String inspectionPlanId) {
+ if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
+ ExceptionCast.cast("鍙傛暟閿欒");
+ }
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ QueryWrapper<Map> queryWrapper = Wrappers.query();
+ if (null != inspectionPlanId) {
+ queryWrapper.eq("t2.plan_id", inspectionPlanId);
+ // 鎺掑簭鍐欐硶
+ List<OrderItem> orderItems = new ArrayList<>();
+ orderItems.add(OrderItem.desc("t2.sorter"));
+ ((Page<Map>) pageData).setOrders(orderItems);
+ }
+ return super.getBaseMapper().queryListByPlanId(pageData,queryWrapper);
+ }
}
--
Gitblit v1.9.3