From 992deae2bf67803b5158673aec993bd60ad5c2d1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 十月 2025 11:54:09 +0800
Subject: [PATCH] 检验任务数据分类查询问题修复
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java | 4 +++-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 11 +----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 72a1f65..ad8f72d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -180,17 +180,8 @@
Integer isCheck = insOrderPlanDTO.getIsCheck();
insOrderPlanDTO.setIsCheck(null);
String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
- Integer typeSource = insOrderPlanDTO.getTypeSource();
- QueryWrapper<InsOrderPlanDTO> queryWrapper = new QueryWrapper<>();
- if(ObjectUtils.isNotEmpty(typeSource)){
- insOrderPlanDTO.setTypeSource(null);
- queryWrapper = QueryWrappers.queryWrappers(insOrderPlanDTO)
- .eq(!Objects.equals(-1,typeSource),"type_source",typeSource)
- .isNotNull(!Objects.equals(-1,typeSource),"ifs_inventory_id")
- .isNull(Objects.equals(-1,typeSource),"ifs_inventory_id");//濮旀墭璇曢獙鏌ヨ闈瀒fs鎶ユ璁㈠崟
- }
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
- queryWrapper,
+ QueryWrappers.queryWrappers(insOrderPlanDTO),
userName,
userId,
sonLaboratory,
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java
index a4b5d3d..9c46a62 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java
@@ -51,8 +51,10 @@
if (!field.getName().equals("orderBy")) {
if(value.getClass()== LocalDateTime.class){
wrapper.like(StrUtil.toUnderlineCase(field.getName()), ((LocalDateTime) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- }else{
+ }else if(value.getClass()== String.class){
wrapper.like(StrUtil.toUnderlineCase(field.getName()), value);
+ }else{
+ wrapper.eq(StrUtil.toUnderlineCase(field.getName()), value);
}
} else {
Map<String, String> map = (Map<String, String>) value;
--
Gitblit v1.9.3