排单优先级更改-排单分页去除重复数据

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<PlanDO> {
     default PageResult<PlanDO> selectPage(PlanPageReqVO reqVO) {
         if(StrUtil.isNotBlank(reqVO.getCustomer())) {
             return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX<PlanDO>()
+                    .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<PlanDO> {
         }
 
         return selectPage(reqVO, new LambdaQueryWrapperX<PlanDO>()
+                .eq(PlanDO::getDeleted,false)
                 .eq(PlanDO::getOrganId,getUserOrganId())
                 .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
                 .eqIfPresent(PlanDO::getSort, reqVO.getSort())

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);