From e97beed86be71cb4c45b086588ebf705e4ecfcad Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 9 May 2024 12:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/dal/mysql/taskreport/TaskReportMapper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java index 43bc1c82..77140626 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java @@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.biz.dal.mysql.taskreport; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.framework.mybatis.core.query.MPJLambdaWrapperX; import com.chanko.yunxi.mes.module.biz.controller.admin.taskreport.vo.TaskReportPageReqVO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.plan.PlanDO; @@ -25,7 +26,7 @@ import org.springframework.util.StringUtils; public interface TaskReportMapper extends BaseMapperX { default PageResult selectPage(TaskReportPageReqVO reqVO) { - MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + MPJLambdaWrapperX query = new MPJLambdaWrapperX<>(); query.selectAll(TaskReportDO.class) .distinct() .select("d.code as projectCode", "d.project_name as projectName", @@ -46,13 +47,15 @@ public interface TaskReportMapper extends BaseMapperX { .orderByDesc(TaskReportDO::getId) .disableSubLogicDel(); - query.eq(reqVO.getOwner() != null, TaskReportDO::getOwner, reqVO.getOwner()) + query.eqIfPresent(TaskReportDO::getType, reqVO.getType()) + .eq(reqVO.getOwner() != null, TaskReportDO::getOwner, reqVO.getOwner()) .eq(reqVO.getDispatchDetailId() != null, TaskReportDO::getDispatchDetailId, reqVO.getDispatchDetailId()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getDispatchCode()), TaskDispatchDO::getCode, reqVO.getDispatchCode()) + ; return selectPage(reqVO, query);