From 7a62afb5cec9a5c7caf6babc1c63706d8fe516dc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 3ead21d..5a4765b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -252,9 +252,13 @@
//鏌ヨ浠婂ぉ鎵�鏈夌殑浠诲姟鏁版嵁
List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getStatus,
Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.IN_WAIT.getKey(),
@@ -271,9 +275,13 @@
PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platform,platformJobList);
platform.setPlatformWorkVO(platformWorkVO);
}
- }
- for (PlatformGroup platformGroup:platformGroups) {
- platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ for (PlatformGroup platformGroup:platformGroups) {
+ platformGroup.setPlatformList(allPlatformList.stream().filter(m->m.getShowConfig()&&Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ }
+ }else{
+ for (PlatformGroup platformGroup:platformGroups) {
+ platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ }
}
return platformGroups;
}
@@ -282,7 +290,7 @@
public static PlatformWorkVO getPlatformWorkVO(Platform platform,List<PlatformJob> platformJobList){
PlatformWorkVO platformWorkVO = new PlatformWorkVO();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
- //鑾峰彇鏈堝彴涓嬬殑鎵�鏈変綔涓氭暟鎹�
+ //鑾峰彇鏈堝彴缁勪笅鐨勬墍鏈変綔涓氭暟鎹�
List<PlatformJob> platformJobs = platformJobList.stream().filter(
i->Constants.equalsInteger(i.getPlatformId(),platform.getId())
|| Constants.equalsInteger(i.getPlatformGroupId(),platform.getGroupId())
@@ -294,16 +302,14 @@
platformWorkVO.setCallNum(
platformJobs.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId()) && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList()).size()
);
-
- platformWorkVO.setWaitNum(
+ platformWorkVO.setWaitNum(
platformJobs.stream().filter(i->
- Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
- || Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
).collect(Collectors.toList()).size()
+
platformJobList.stream().filter(i->Constants.equalsInteger(platform.getId(),i.getPlatformId())
- && (Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
+ && (Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) || Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
)
).collect(Collectors.toList()).size()
);
@@ -323,18 +329,23 @@
@Override
public PlatformGroupWorkVO getPlatformGroupWork(Integer platformGroupId){
PlatformGroupWorkVO platformGroupWorkVO = new PlatformGroupWorkVO();
- platformGroupWorkVO.setExceptionNum(platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ platformGroupWorkVO.setExceptionNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
)
);
- platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
- .in(PlatformJob::getStatus,
- Constants.PlatformJobStatus.WAIT_CALL.getKey(),
- Constants.PlatformJobStatus.IN_WAIT.getKey(),
- Constants.PlatformJobStatus.CALLED.getKey()
+ .and( i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
+ .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroupId+" ) ")
)
)
);
--
Gitblit v1.9.3