From ee378e653325f326a46eb152604e5eb78b7b1775 Mon Sep 17 00:00:00 2001 From: yangsb Date: Sun, 28 Apr 2024 14:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E5=88=86=E9=A1=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/PlanPageReqVO.java | 3 ++ .../controller/admin/plan/vo/PlanRespVO.java | 4 +++ .../executor/dal/mysql/plan/PlanMapper.java | 28 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java index 119c2f016..b120e40de 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java @@ -40,6 +40,9 @@ public class PlanPageReqVO extends PageParam { @Schema(description = "生产单号") private String orderNos; + @Schema(description = "生产单客户") + private String customer; + @Schema(description = "备注", example = "你说的对") private String remark; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java index 3636b3435..1211947a0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java @@ -60,6 +60,10 @@ public class PlanRespVO { @ExcelProperty("备注") private String remark; + @Schema(description = "创建人") + @ExcelProperty("创建人") + private String creator; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index 035463c15..91efe22f7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -2,10 +2,15 @@ package com.cf.imes.module.executor.dal.mysql.plan; import java.util.*; +import cn.hutool.core.util.StrUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; +import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; +import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO; +import com.cf.imes.module.executor.dal.dataobject.planitem.PlanItemDO; import org.apache.ibatis.annotations.Mapper; import com.cf.imes.module.executor.controller.admin.plan.vo.*; @@ -18,6 +23,29 @@ import com.cf.imes.module.executor.controller.admin.plan.vo.*; public interface PlanMapper extends BaseMapperX { default PageResult selectPage(PlanPageReqVO reqVO) { + if(StrUtil.isNotBlank(reqVO.getCustomer())) { + return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX() + .eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) + .eqIfPresent(PlanDO::getSort, reqVO.getSort()) + .eqIfPresent(PlanDO::getType, reqVO.getType()) + .eqIfPresent(PlanDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PlanDO::getIsPay, reqVO.getIsPay()) + .eqIfPresent(PlanDO::getMachineId, reqVO.getMachineId()) + .betweenIfPresent(PlanDO::getPlanTime, reqVO.getPlanTime()) + .eqIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos()) + .eqIfPresent(PlanDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PlanDO::getOperator, reqVO.getOperator()) + .betweenIfPresent(PlanDO::getProduceTime, reqVO.getProduceTime()) + .leftJoin(PlanItemDO.class, PlanItemDO::getPlanId, PlanDO::getId) + .leftJoin(OrderItemDO.class, OrderItemDO::getId, PlanItemDO::getItemId) + .leftJoin(OrderDO.class, OrderDO::getId, OrderItemDO::getOrderId) + .like(OrderDO::getCustomer, reqVO.getCustomer()) + .orderByAsc(PlanDO::getSort) + .orderByDesc(PlanDO::getId) + ); + } + return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .eqIfPresent(PlanDO::getSort, reqVO.getSort())