From 03b98b33d205077a1b921af0c75b494bd9f39793 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 17 Oct 2025 10:57:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(qc):=20=E9=87=8D=E6=9E=84=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 LambdaQueryWrapper 替换为 QueryWrapper 以增强查询灵活性 - 更新 XML 映射文件中的 SQL 片段位置以优化执行顺序 - 新增 buildQueryWrapperPlus 方法支持多字段模糊查询 - 添加 verifyTarget、workshopSection、process 等新增字段的查询条件-保留原有分页和逻辑删除功能确保数据一致性 --- .../klp/mes/qc/mapper/WmsCheckTaskMapper.java | 3 ++- .../service/impl/WmsCheckTaskServiceImpl.java | 22 +++++++++++++++++-- .../mapper/qc/WmsCheckTaskMapper.xml | 3 +-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java index a0219bab..583fc9cd 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java @@ -1,6 +1,7 @@ package com.klp.mes.qc.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.mes.qc.domain.WmsCheckTask; @@ -16,7 +17,7 @@ import org.apache.ibatis.annotations.Param; */ public interface WmsCheckTaskMapper extends BaseMapperPlus { - Page selectVoPagePlus(Page build,@Param("ew") LambdaQueryWrapper lqw); + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper qw); WmsCheckTaskVo selectVoByIdPlus(Long taskId); } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index d1291cae..f34f08f1 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.mes.qc.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -68,10 +69,25 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { */ @Override public TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); + QueryWrapper qw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(WmsCheckTaskBo bo) { + Map params = bo.getParams(); + com.baomidou.mybatisplus.core.conditions.query.QueryWrapper qw = Wrappers.query(); + qw.like(StringUtils.isNotBlank(bo.getTaskName()), "t.task_name", bo.getTaskName()); + // 新增字段查询条件 + qw.like(StringUtils.isNotBlank(bo.getVerifyTarget()), "t.verify_target", bo.getVerifyTarget()); + qw.like(StringUtils.isNotBlank(bo.getWorkshopSection()), "t.workshop_section", bo.getWorkshopSection()); + qw.like(StringUtils.isNotBlank(bo.getProcess()), "t.process", bo.getProcess()); + qw.like(StringUtils.isNotBlank(bo.getUnitGroup()), "t.unit_group", bo.getUnitGroup()); + qw.eq(bo.getInspectionResult() != null, "t.inspection_result", bo.getInspectionResult()); + qw.like(StringUtils.isNotBlank(bo.getInspectionType()), "t.inspection_type", bo.getInspectionType()); + //逻辑删除 + qw.eq("t.del_flag", 0); + return qw; + } /** * 查询检查任务列表 */ @@ -82,6 +98,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { return TableDataInfo.build(result); } + + /** * 查询检查任务列表 */ diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index 489b471b..0904914d 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -25,11 +25,10 @@ FROM wms_check_task t LEFT JOIN wms_check_task_item ti ON t.task_id = ti.check_task_id AND ti.del_flag = 0 LEFT JOIN wms_check_item i ON ti.check_item_id = i.item_id AND i.del_flag = 0 - WHERE t.del_flag = 0 + ${ew.customSqlSegment} AND EXISTS ( SELECT 1 FROM wms_check_task_item ti2 WHERE ti2.check_task_id = t.task_id AND ti2.status = 0 AND ti2.del_flag = 0 ) - ${ew.customSqlSegment} GROUP BY t.task_id