Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liuzhaotian
2024-06-29 18:29:07 +08:00
parent 01c02bc6cc
commit 30f394ef21
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java
+2
View File
@@ -28,6 +28,7 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
default PageResult<PlanDO> selectPage(PlanPageReqVO reqVO) { default PageResult<PlanDO> selectPage(PlanPageReqVO reqVO) {
if(StrUtil.isNotBlank(reqVO.getCustomer())) { if(StrUtil.isNotBlank(reqVO.getCustomer())) {
return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX<PlanDO>() return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX<PlanDO>()
.eq(PlanDO::getDeleted,false)
.eq(PlanDO::getOrganId,getUserOrganId()) .eq(PlanDO::getOrganId,getUserOrganId())
.likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.eqIfPresent(PlanDO::getSort, reqVO.getSort()) .eqIfPresent(PlanDO::getSort, reqVO.getSort())
@@ -51,6 +52,7 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
} }
return selectPage(reqVO, new LambdaQueryWrapperX<PlanDO>() return selectPage(reqVO, new LambdaQueryWrapperX<PlanDO>()
.eq(PlanDO::getDeleted,false)
.eq(PlanDO::getOrganId,getUserOrganId()) .eq(PlanDO::getOrganId,getUserOrganId())
.likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.eqIfPresent(PlanDO::getSort, reqVO.getSort()) .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
+1 -1
View File
@@ -105,7 +105,7 @@ public class PlanServiceImpl implements PlanService {
long sort = System.currentTimeMillis(); long sort = System.currentTimeMillis();
PlanDO plan = BeanUtils.toBean(createReqVO, PlanDO.class); PlanDO plan = BeanUtils.toBean(createReqVO, PlanDO.class);
plan.setIsPay(Boolean.FALSE); plan.setIsPay(Boolean.FALSE);
plan.setSort(sort); plan.setSort(0L);
plan.setPlanNo(identifierGenerator.nextId(null).toString()); plan.setPlanNo(identifierGenerator.nextId(null).toString());
String orderNos = itemList.stream().map(i -> i.getOrderId()).distinct().collect(Collectors.toList()).toString(); String orderNos = itemList.stream().map(i -> i.getOrderId()).distinct().collect(Collectors.toList()).toString();
plan.setOrderNos(orderNos); plan.setOrderNos(orderNos);