【需求】报工记录分页查询增加参数

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<TaskReportDO> {
 
     default PageResult<TaskReportDO> selectPage(TaskReportPageReqVO reqVO) {
-        MPJLambdaWrapper<TaskReportDO> query = new MPJLambdaWrapper<>();
+        MPJLambdaWrapperX<TaskReportDO> 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<TaskReportDO> {
                 .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);