From 4db1c10cc1865cfda53910b100856e48a31d3023 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 31 七月 2024 11:11:12 +0800
Subject: [PATCH] disabled filter
---
pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml | 3 +++
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml | 3 +++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 2 ++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 9aa68fd..a9282bd 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -84,6 +84,9 @@
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
+ <if test="disabled != null and disabled != ''">
+ t.disabled != 1 and -- FIND_IN_SET(t.disabled, #{disabled}) and
+ </if>
</trim>
order by sort desc
<trim prefix="limit " >
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
index f4e0ffc..bb79f06 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -38,6 +38,9 @@
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
+ <if test="disabled != null and disabled != ''">
+ t.disabled != 1 and -- FIND_IN_SET(t.disabled, #{disabled}) and
+ </if>
</trim>
</select>
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index c27d466..6d3295e 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -473,6 +473,7 @@
public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);//item start count
+ params.put("disabled", "0");
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
return qualityItemsDao.selectSome(params);
}
@@ -480,6 +481,7 @@
public List<PltProductTestInspectionItems> getTestItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);
+ params.put("disabled", "0");
return testItemsDao.selectSome(params);
}
--
Gitblit v1.8.0