From d08f0fe8720a66805cec15dc70b3460130da12e8 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 14 Nov 2025 16:25:34 +0800 Subject: [PATCH] =?UTF-8?q?NgService=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/quality/constant/ColBase.java | 2 ++ .../desk/quality/service/NgService.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java index e21d016..e1f9f12 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ColBase.java @@ -4,5 +4,7 @@ public interface ColBase { String STATUS = "STATUS"; + String SORT = "SORT"; + String ID = "ID"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java index 0a62d3b..60e8bab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.constant.ColValue; import org.springblade.desk.quality.mapper.gen.NgGenMapper; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.request.NgSearch; -import org.springblade.desk.quality.wrapper.gen.NgGenWrapper; import org.springframework.stereotype.Service; import java.util.List; @@ -24,10 +24,12 @@ public class NgService { public List listByType(NgSearch search) { return genMapper.selectList( new QueryWrapper() - .eq("NG_TYPE",search.getNgType()) - .eq("PARENT_ID",search.getParentId()) - .eq("PRODUCT_ID",search.getProductId()) - .eq("PROCESS_ID",search.getProcessId()) + .eq(ColBase.STATUS, ColValue.STATE_ENABLE) + .eq("NG_TYPE", search.getNgType()) + .eq("PARENT_ID", search.getParentId()) + .eq("PRODUCT_ID", search.getProductId()) + .eq("PROCESS_ID", search.getProcessId()) + .orderByAsc(ColBase.SORT) ); } }