From a41df38db27a65bb87be3fa28ef7e97ece133f3e Mon Sep 17 00:00:00 2001 From: think <1787994136@qq.com> Date: Tue, 14 Jan 2025 13:44:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BA=E7=A9=BA=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=85=B6=E4=BB=96=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E7=94=A8=E6=97=B6=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/processdesign/ProcessDesignMapper.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index 67bb836..00d1e64 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -77,12 +77,15 @@ public interface ProcessDesignMapper extends BaseMapperX { /*if(reqVO.getUncompletedDesign() != null && reqVO.getUncompletedDesign()){ query.and(QueryWrapper -> QueryWrapper.apply("COALESCE(z.progress, 0) < {0}", 100).ne(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode())); }*/ - if(reqVO.getPgType()==0){ - query.and(QueryWrapper -> QueryWrapper.apply("z.progress < {0}" , 100).or().apply("z.progress is null")); - }else{ - query.and(QueryWrapper -> QueryWrapper.apply("z.progress >= {0}" , 100)); + if(reqVO.getPgType() != null){ + if(reqVO.getPgType()==0){ + query.and(QueryWrapper -> QueryWrapper.apply("z.progress < {0}" , 100).or().apply("z.progress is null")); + }else{ + query.and(QueryWrapper -> QueryWrapper.apply("z.progress >= {0}" , 100)); + } } + return selectPage(reqVO, query); }