From 0c3093f553437faf2bfd48ff23d753872f86c9d7 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 30 九月 2024 17:05:50 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 60 +++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 27 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java index 22d5638..d611dd0 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java @@ -1507,37 +1507,43 @@ @Override public List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param){ List<PlatformDataListResponse> platformDataListResponseList = new ArrayList<>(); - List<Platform> platformList = platformJoinMapper.selectList( - new MPJLambdaWrapper<Platform>().eq(Platform::getIsdeleted,Constants.ZERO) - .eq(Platform::getStatus,Constants.ZERO) - ); - for (Platform platform:platformList) { - PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse(); - platformDataListResponse.setId(platform.getId()); - platformDataListResponse.setHkId(platform.getHkId()); - platformDataListResponse.setName(platform.getName()); - platformDataListResponse.setWorkStatus(Constants.ZERO); - //鏌ヨ褰撳墠浣滀笟杞﹁締 - PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda() - .eq(PlatformJob::getIsdeleted,Constants.ZERO) - .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) - .orderByDesc(PlatformJob::getWorkTime) - .last(" limit 1") + try { + List<Platform> platformList = platformJoinMapper.selectList( + new MPJLambdaWrapper<Platform>().eq(Platform::getIsdeleted,Constants.ZERO) + .eq(Platform::getStatus,Constants.ZERO) ); - if(Objects.nonNull(platformJob)){ - platformDataListResponse.setCarCode(platformJob.getCarCodeFront()); - platformDataListResponse.setWorkType( - Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh) - ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh) - ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)?Constants.ZERO:Constants.ONE + for (Platform platform:platformList) { + PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse(); + platformDataListResponse.setId(platform.getId()); + platformDataListResponse.setHkId(platform.getHkId()); + platformDataListResponse.setName(platform.getName()); + platformDataListResponse.setWorkStatus(Constants.ZERO); + //鏌ヨ褰撳墠浣滀笟杞﹁締 + PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda() + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) + .orderByDesc(PlatformJob::getWorkTime) + .last(" limit 1") ); - platformDataListResponse.setWorkStatus(Constants.ONE); - //鏌ヨ浣滀笟鏃堕暱 - platformDataListResponse.setWorkTime( - this.getWorkTime(platformJob) - ); + if(Objects.nonNull(platformJob)){ + platformDataListResponse.setCarCode(platformJob.getCarCodeFront()); + platformDataListResponse.setWorkType( + Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh) + ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh) + ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)?Constants.ZERO:Constants.ONE + ); + platformDataListResponse.setWorkStatus(Constants.ONE); + //鏌ヨ浣滀笟鏃堕暱 + platformDataListResponse.setWorkTime( + this.getWorkTime(platformJob) + ); + } } + }catch (Exception e){ + System.out.println("===============================鎶ラ敊鍟︼細\n"); + e.printStackTrace(); } + return platformDataListResponseList; } -- Gitblit v1.9.3