From c996e23943007e749f06c8b54f46a576a59fb055 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 10 六月 2025 10:57:21 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 92 +++++++++++++++++++++++++++++++--------------- 1 files changed, 62 insertions(+), 30 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 dbd6259..c04d05e 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 @@ -326,7 +326,6 @@ .eq(pageWrap.getModel().getInType() != null, PlatformJob::getInType, pageWrap.getModel().getInType()) .eq(pageWrap.getModel().getTotalNum() != null, PlatformJob::getTotalNum, pageWrap.getModel().getTotalNum()) .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId()) - .apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')") .apply(pageWrap.getModel().getQueryStatusForPower() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatusForPower()+"')") .apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')") @@ -336,11 +335,9 @@ .le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd())) .ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart())) .le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd())) - // .isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), // PlatformJob::getContractNum) // .isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum) - .exists(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), "select 1 from platform_wms_detail tt where tt.isdeleted=0 and tt.job_id=t.id") .notExists(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), @@ -363,8 +360,6 @@ }); return PageData.from(platformJobIPage); } - - @Override public PageData<PlatformJob> platformCallList(PageWrap<PlatformJob> pageWrap) { @@ -1159,14 +1154,12 @@ } } - @Override public void cancelInPark(PlatformJob platformJob){ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO) || Constants.equalsInteger(platformJob.getType(),Constants.THREE) || StringUtils.isBlank(platformJob.getCarCodeFront()) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ - List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda() .eq(VisitPark::getCarCode,platformJob.getCarCodeFront()) .eq(VisitPark::getObjType,Constants.ONE) @@ -1191,7 +1184,6 @@ } } } - /** * 鏈堝彴鍙彿 */ @@ -1636,7 +1628,7 @@ TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){ for(TmsLockStatusQueryResponse s : lockResult.getData()){ - if(StringUtils.isBlank(s.getContractNumber())){ + if(StringUtils.isBlank(s.getOutDate())){ continue; } platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() @@ -1686,28 +1678,37 @@ Date date = new Date(); List<String> codeList =new ArrayList<>(); for(PlatformWmsDetail d : details){ - codeList.add(d.getContractNum()); + if(StringUtils.isNotBlank(d.getContractNum())){ + if(StringUtils.isNotBlank(d.getContractNum())){ + codeList.add(d.getContractNum()); + } + } } - TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); - tmsLock.setContractNumbers(codeList); List<Integer> jobIds = new ArrayList<>(); - TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); - if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){ - for(TmsLockStatusQueryResponse s : lockResult.getData()){ - try { - //寮傚父澶勭悊锛岃兘澶勭悊涓�涓槸涓�涓� - platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() - .eq(PlatformWmsDetail::getContractNum,s.getContractNumber()) - .set(PlatformWmsDetail::getEditDate,date) - .set(PlatformWmsDetail::getLockDate,s.getOutDate()) - .set(PlatformWmsDetail::getLockStatus,Constants.ONE) - .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); - PlatformWmsDetail job = getJobByContractnumFromDetail(s.getContractNumber(),details); - if(job != null){ - jobIds.add(job.getJobId()); + if(codeList.size()>0){ + TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); + tmsLock.setContractNumbers(codeList); + TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); + if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){ + for(TmsLockStatusQueryResponse s : lockResult.getData()){ + try { + if(StringUtils.isBlank(s.getOutDate())){ + continue; + } + //寮傚父澶勭悊锛岃兘澶勭悊涓�涓槸涓�涓� + platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() + .eq(PlatformWmsDetail::getContractNum,s.getContractNumber()) + .set(PlatformWmsDetail::getEditDate,date) + .set(PlatformWmsDetail::getLockDate,s.getOutDate()) + .set(PlatformWmsDetail::getLockStatus,Constants.ONE) + .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); + PlatformWmsDetail job = getJobByContractnumFromDetail(s.getContractNumber(),details); + if(job != null){ + jobIds.add(job.getJobId()); + } + }catch (Exception e){ + logger.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage()); } - }catch (Exception e){ - logger.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage()); } } } @@ -2458,11 +2459,10 @@ .in(PlatformJob::getId,jobIdList) ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){ - platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() .set(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()) .set(PlatformJob::getDoneDate,new Date()) - .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) + .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),Constants.PlatformJobStatus.WAIT_CALL.getKey()) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .in(PlatformJob::getId,platformJobList.stream().map(i->i.getId()).collect(Collectors.toList()))); } @@ -2472,5 +2472,37 @@ } + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public PlatformJob restoreWork(JobOperateDTO jobOperateDTO){ + if(Objects.isNull(jobOperateDTO) + || Objects.isNull(jobOperateDTO.getJobId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId()); + if(Objects.isNull(platformJob)||Constants.equalsInteger(platformJob.getIsdeleted(),Constants.ONE)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); + } + Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId()); + if(Objects.isNull(platform)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅"); + } + PlatformJob oldPlatformJob = new PlatformJob(); + BeanUtils.copyProperties(platformJob,oldPlatformJob); + if(Objects.isNull(platformJob.getStartDate())){ + platformJob.setStartDate(new Date()); + } + platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey()); + platformJob.setEditDate(new Date()); + platformJobMapper.updateById(platformJob); + + //瀛樺偍鎿嶄綔鏃ュ織 + savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob, + Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName())); + return platformJob; + } } -- Gitblit v1.9.3