最新版本

jiangping

2024-10-10 02af384faaa0572008405037e6e8917c7ad22136

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -361,12 +361,30 @@
            List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
                    .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                    .eq(PlatformWmsDetail::getJobId,platformJob.getId()));

            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
                platformJob.setTotalNum(
                        platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
                );
                platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList);
                platformJob.setPlatformWmsJob(platformWmsJob);

                if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh)
                        || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)){

                    Integer unLockCount = platformWmsDetailList.stream().filter(i->Constants.equalsInteger(i.getLockStatus(),Constants.ZERO)).collect(Collectors.toList()).size();
                    if(Constants.equalsInteger(unLockCount,Constants.ZERO)){
                        platformJob.setLockStatus(Constants.TWO);  //全部上锁
                    }else if(Constants.equalsInteger(unLockCount,platformWmsDetailList.size())){
                        platformJob.setLockStatus(Constants.ZERO);  //未上锁
                    }else{
                        platformJob.setLockStatus(Constants.ONE);   //部分上锁
                    }

                }



            }
        } 
    }
@@ -408,7 +426,7 @@
                    platformJob.setWaitTime(waitTime);
                }
            }else{
                platformJob.setWaitTime("等待叫号");
                platformJob.setWaitTime("预计等待：-小时-分钟");
            }
        }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
        || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
@@ -430,7 +448,6 @@
                    .ne(PlatformLog::getParam3,Constants.ZERO+"")
                    .orderByDesc(PlatformLog::getCreateDate));
            platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum));


        }
    }
@@ -463,7 +480,6 @@
            //查询前方排队数量
            this.queryWaitNum(platformJob);
        }


        driverHomeVO.setPlatformJobList(platformJobList);

@@ -677,6 +693,7 @@
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                Constants.PlatformJobStatus.CALLED.getKey())
                        .orderByDesc(PlatformJob::getStatus)
                        .orderByAsc(PlatformJob::getSignDate)
        );
        //获取所有月台组
@@ -704,6 +721,7 @@
                            .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                    Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                    Constants.PlatformJobStatus.CALLED.getKey())
                            .orderByDesc(PlatformJob::getStatus)
                            .orderByDesc(PlatformJob::getSignDate));
            platformGroup.setSignJobList(platformJobSignInList);
            //查询当前月台组下
@@ -1360,7 +1378,8 @@
            }
        }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){
            platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
            platformLog.setParam3("0");
            platformLog.setParam3("0"); 
            platformLog.setRemark(platformJobBefor.getPlatformId().toString());
        }else{
            platformLog.setParam3("0");
        }
@@ -1551,9 +1570,12 @@
                );
                platformDataListResponse.setWorkStatus(Constants.ONE);
                //查询作业时长
//                Long workTime = this.getWorkTime(platformJob);
                Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60;
                platformDataListResponse.setWorkTime(
                        this.getWorkTime(platformJob)
                        min
                );

                //计算已作业时长 根据月台工作效率 计算任务量需要时间
                if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
                    platformDataListResponse.setFinishTime(null);