diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java index 1c873f1d..e28c0000 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java @@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import java.util.List; + /** * 检查任务视图对象 wms_check_task @@ -40,6 +42,6 @@ public class WmsCheckTaskVo { /** * 检查项列表 */ - private java.util.List itemList; + private List itemList; } 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 e3cd586d..eb36d0e0 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,10 +1,12 @@ package com.klp.mes.qc.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.mes.qc.domain.WmsCheckTask; import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * 检查任务Mapper接口 @@ -14,5 +16,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsCheckTaskMapper extends BaseMapperPlus { - Page selectVoPagePlus(Page build, LambdaQueryWrapper lqw); + Page selectVoPagePlus(Page build,@Param("ew") LambdaQueryWrapper lqw); } diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index 2148f892..b2376456 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -19,7 +19,6 @@ 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} GROUP BY t.task_id