From 5d2932cadaee4be576c1b650b402c74d6296e6dd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 13:56:58 +0800
Subject: [PATCH] 修改设备计划搜索
---
laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 4 ++--
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
index b66eb6c..a327be4 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
@@ -18,8 +18,10 @@
@ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
private Long currentPage;
+
@ApiModelProperty(value = "姣忛〉澶氬皯鏉�", example = "10", required = true)
private Long pageSize;
+
@ApiModelProperty(value = "璁″垝鍗曞彿", required = false)
private String plannedOrderNumber;
}
diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 1a7b226..87445db 100644
--- a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -46,7 +46,7 @@
from metering_plan
where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
LIMIT #{limitPage.start},#{limitPage.end}) p
LEFT JOIN metrical_information i ON p.id = i.plan
@@ -56,7 +56,7 @@
<select id="getTotal" resultType="java.util.Map">
select count(id) num from metering_plan where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
</select>
<select id="getPlanMeasureInstrument"
--
Gitblit v1.9.3