From b882510e16aad7e84d1f50c58831b54ebb5bae22 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 11 三月 2025 17:19:16 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java index 9a41523..62f7ce3 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java @@ -132,6 +132,7 @@ .select(PlatformJob::getTotalNum) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(PlatformJob::getOrigin,Constants.ONE) + .in(PlatformJob::getType,new Integer[]{0,2,4}) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey() , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() , Constants.PlatformJobStatus.LEAVED.getKey()) @@ -801,11 +802,13 @@ .selectAll(PlatformJob.class) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(PlatformJob::getCarCodeFront,param.getCarCode()) - .in(PlatformJob::getStatus, + .notIn(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey(), Constants.PlatformJobStatus.LEAVED.getKey(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(), - Constants.PlatformJobStatus.CALLED.getKey()) + Constants.PlatformJobStatus.CANCEL.getKey() + ) + .orderByAsc(PlatformJob::getId) .last("limit 1")); dealJobDetailAndContractBiz(job,data); @@ -951,6 +954,7 @@ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum) .select(PlatformJob::getStatus,PlatformJob::getStatus) .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .in(PlatformJob::getType,Constants.ONE,Constants.THREE) .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(), Constants.PlatformJobStatus.LEAVED.getKey(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()) @@ -1739,11 +1743,11 @@ .eq(Visits::getIsdeleted,Constants.ZERO) .apply("to_days(create_date)=to_days(now())") .in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂� - result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>() + result.setRegisterVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>() .eq(Visits::getIsdeleted,Constants.ZERO) .apply("to_days(create_date)=to_days(now())") .in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁� - result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>() + result.setLevelNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>() .eq(Visits::getIsdeleted,Constants.ZERO) .apply("to_days(create_date)=to_days(now())") .in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂� @@ -1791,6 +1795,7 @@ result.getVisitRetentionDataList().add(t); }); } + result.setRetentionNum(result.getVisitRetentionDataList().size()); return result; } @@ -1970,7 +1975,7 @@ List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>() .selectAll( PlatformJob.class) // .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", create_date) - .apply("to_days(t.create_date) = to_days(now())") + .apply("to_days(t.done_date) = to_days(now())") .eq(Platform::getIsdeleted, Constants.ZERO) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey() , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() @@ -2190,15 +2195,22 @@ //宸蹭綔涓氭暟 data.setWorkedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>() .eq(PlatformJob::getIsdeleted,Constants.ZERO) - .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());}) - .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey() + .and(w-> w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey()) + .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey() ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() - ,Constants.PlatformJobStatus.LEAVED.getKey()) - .apply("to_days(done_date) = to_days(now())");}) - .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()) - .apply("to_days(error_date) = to_days(now())");}) - .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()) - .apply("to_days(trans_platform_date) = to_days(now())");}) + ,Constants.PlatformJobStatus.LEAVED.getKey()).apply("to_days(done_date) = to_days(now())") + .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()).apply("to_days(done_date) = to_days(now())") + .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()).apply("to_days(trans_platform_date) = to_days(now())") + ) +// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());}) +// .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey() +// ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() +// ,Constants.PlatformJobStatus.LEAVED.getKey()) +// .apply("to_days(done_date) = to_days(now())");}) +// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()) +// .apply("to_days(error_date) = to_days(now())");}) +// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()) +// .apply("to_days(trans_platform_date) = to_days(now())");}) ).intValue()); data.setVideoPluginUrl(getVideoUrl()); @@ -2633,7 +2645,7 @@ return infoList; } /** - * 杩戜竷鏃ュ埌璐ф儏鍐� + * 杩戜竷鏃ュ埌璐ф儏鍐�-鏀规垚杩�15鏃� * @return */ @Override @@ -2645,17 +2657,17 @@ param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯 } Date date = new Date(); - Date startDate = DateUtil.addDaysToDate(date,-7); + Date startDate = DateUtil.addDaysToDate(date,-15); //鐪嬫澘澶у睆杩�7鏃ュ埌璐ф儏鍐垫棩鏈� 0琛ㄧず褰撳ぉ褰撳墠鎺�7澶╋紝-1琛ㄧず鏈湀鍒�1鍙�-7鍙� String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode(); if(StringUtils.equals(flag,"-1")){ startDate =DateUtil.getBeginDayOfMonth(0); - date = DateUtil.addDaysToDate(startDate,7); + date = DateUtil.addDaysToDate(startDate,15); } param.setNcCreateDateFrom(DateUtil.getShortTime(startDate)); param.setNcCreateDateThrough(DateUtil.getShortTime(date)); List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲� - for (int i = 0; i < 7; i++) { + for (int i = 0; i < 15; i++) { LastSevenDaysOrderVo model = new LastSevenDaysOrderVo(); Date td = DateUtil.addDaysToDate(date,-i); model.setDateStr(DateUtil.getShortTime(td)); -- Gitblit v1.9.3