doum
2 天以前 dd448977e5c770bf3ae600ee782e3445e8100d99
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -144,13 +144,15 @@
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起,月台组信息不正确!");
            }
            //如果月台分组发生变化
            Long count =  platformJobJoinMapper.selectCount(  new QueryWrapper<PlatformJob>().lambda()
            Long count =  platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
                    .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                    .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
                            ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
                            ,Constants.PlatformJobStatus.DONE.getKey()
                            ,Constants.PlatformJobStatus.LEAVED.getKey()
                            ,Constants.PlatformJobStatus.CANCEL.getKey()
                    .eq(PlatformJob::getPlatformId,model.getId())
                    .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()
                            ,Constants.PlatformJobStatus.CALLED.getKey()
                            ,Constants.PlatformJobStatus.WORKING.getKey()
                            ,Constants.PlatformJobStatus.TRANSFERING.getKey()
                            ,Constants.PlatformJobStatus.EXCEPTION.getKey()
                            ,Constants.PlatformJobStatus.OVER_NUMBER.getKey()
                    ));
            if(count!=null && count>0){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,当前月台有正在作业的任务,不能进行月台组切换操作!");
@@ -293,6 +295,7 @@
                .eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
                .eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
                .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
                .eq(pageWrap.getModel().getType() != null, Platform::getType, pageWrap.getModel().getType())
                .orderByAsc(Platform::getSortnum)
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {