From d64fff03419e8bd3d3916688ff90db3e062fa4a8 Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 7 Jun 2024 16:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E3=80=911=EF=BC=9A=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=E5=80=BC=E3=80=82=202?= =?UTF-8?q?=EF=BC=9A=E6=A3=80=E6=9F=A5=E4=B8=80=E4=B8=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=20=E5=8F=AA=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E7=9A=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=BA=E2=80=9C=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90/=E5=B7=B2=E7=BB=88=E6=AD=A2=E2=80=9D=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=20=E5=A6=82=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=94=B9=E6=88=90=E8=BF=99=E4=B8=AA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java | 2 +- .../chanko/yunxi/mes/module/biz/dal/mysql/plan/PlanMapper.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java index 9a38d6e7..e030f779 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java @@ -184,6 +184,6 @@ public class PlanDO extends BaseDO { @TableField(exist = false) private Integer isCompleted; - + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/plan/PlanMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/plan/PlanMapper.java index ca752e45..852a09d8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/plan/PlanMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/plan/PlanMapper.java @@ -112,6 +112,7 @@ public interface PlanMapper extends BaseMapperX { .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName())) .like(!StringUtils.isEmpty(reqVO.getSpec()), MaterialDO::getSpec, reqVO.getSpec()) .ne(ProjectOrderDO::getOrderStatus, ProjectOrderStatusEnum.TERMINATE.getCode()) + .apply("t.status not in (3,4)") // .isNotNull(TaskReportDO::getId) .eq(ProjectOrderDO::getIsSnapshot, YesOrNoEnum.N.getCode());