访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liukangdong
2024-10-08 552dcd8d48b4de12046ec90e7e908493b26b4336 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java


@@ -255,10 +255,10 @@


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


                            .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)


                            .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                            .eq(Platform::getIsdeleted,Constants.ZERO)


                            .apply(" ( t1.isdeleted = 0 or t.PLATFORM_ID is null  ) ")


                            .in(PlatformJob::getStatus,


                                    Constants.PlatformJobStatus.WAIT_CALL.getKey(),


                                    Constants.PlatformJobStatus.IN_WAIT.getKey(),


@@ -314,7 +314,8 @@


                        ).collect(Collectors.toList()).size()


                );


                platformWorkVO.setExceptionNum(


                        platformJobs.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())).collect(Collectors.toList()).size()


                        platformJobs.stream().filter(i->Constants.equalsInteger(platform.getId(),i.getPlatformId())


                                && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())).collect(Collectors.toList()).size()


                );


                platformWorkVO.setPlatformJobList(platformJobs.stream().filter(


                        i->Constants.equalsInteger(platform.getId(),i.getPlatformId()) && !Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())


@@ -341,7 +342,7 @@


        platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()


                        .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)


                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                        .eq(Platform::getIsdeleted,Constants.ZERO)


                        .apply(" ( t1.isdeleted = 0 or t.PLATFORM_ID is null  ) ")


                        .eq(PlatformJob::getPlatformGroupId,platformGroupId)


                        .and( i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()


                                        .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()