From 30f394ef217b23a60dbacc10b5b301221c1f018c Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 29 Jun 2024 18:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=E6=9B=B4=E6=94=B9-=E6=8E=92=E5=8D=95=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java | 2 ++ .../cf/imes/module/executor/service/plan/PlanServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 d8863169b..6883a02e4 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 @@ -28,6 +28,7 @@ public interface PlanMapper extends BaseMapperX { default PageResult selectPage(PlanPageReqVO reqVO) { if(StrUtil.isNotBlank(reqVO.getCustomer())) { return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX() + .eq(PlanDO::getDeleted,false) .eq(PlanDO::getOrganId,getUserOrganId()) .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .eqIfPresent(PlanDO::getSort, reqVO.getSort()) @@ -51,6 +52,7 @@ public interface PlanMapper extends BaseMapperX { } return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(PlanDO::getDeleted,false) .eq(PlanDO::getOrganId,getUserOrganId()) .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .eqIfPresent(PlanDO::getSort, reqVO.getSort()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 1413c545d..ad15df70f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -105,7 +105,7 @@ public class PlanServiceImpl implements PlanService { long sort = System.currentTimeMillis(); PlanDO plan = BeanUtils.toBean(createReqVO, PlanDO.class); plan.setIsPay(Boolean.FALSE); - plan.setSort(sort); + plan.setSort(0L); plan.setPlanNo(identifierGenerator.nextId(null).toString()); String orderNos = itemList.stream().map(i -> i.getOrderId()).distinct().collect(Collectors.toList()).toString(); plan.setOrderNos(orderNos);