From e1ec365640eefdcb06abb1d73da0d80367f79be3 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 06 一月 2025 09:13:25 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java index d6f34b7..375b2f6 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java @@ -105,6 +105,23 @@ } } + + @Override + public void timerAuto(){ + List<YwPatrolScheme> ywPatrolSchemeList = ywPatrolSchemeMapper.selectList(new QueryWrapper<YwPatrolScheme>().lambda() + .eq(YwPatrolScheme::getIsdeleted,Constants.ZERO) + .eq(YwPatrolScheme::getStatus,Constants.ZERO) + .apply(" START_DATE <= now() and END_DATE>= now() ") + ); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolSchemeList)){ + for (YwPatrolScheme ywPatrolScheme:ywPatrolSchemeList) { + this.createTask(new Date(),ywPatrolScheme); + } + } + } + + + /** * 鏍规嵁鏃ユ湡鐢熸垚浠诲姟 * @param schemeDate @@ -192,6 +209,20 @@ @Override public void deleteById(Integer id, LoginUserInfo user) { + //鍒ゆ柇鏄惁鏈夎繘琛屼腑鎴栧凡瓒呮湡鐨勪换鍔� + if(ywPatrolTaskMapper.selectCount(new QueryWrapper<YwPatrolTask>().lambda() + .eq(YwPatrolTask::getSchemeId,id) + .in(YwPatrolTask::getStatus,Constants.ONE,Constants.THREE,Constants.TWO) + )>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪杩涜涓�/宸插畬鎴愮殑浠诲姟锛屾棤娉曡繘琛屽垹闄�"); + } + if(ywPatrolTaskMapper.selectCount(new QueryWrapper<YwPatrolTask>().lambda() + .eq(YwPatrolTask::getSchemeId,id) + .eq(YwPatrolTask::getStatus,Constants.ZERO) + .le(YwPatrolTask::getEndDate,"now()") + )>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪宸茶秴鏈熺殑浠诲姟锛屾棤娉曡繘琛屽垹闄�"); + } ywPatrolSchemeMapper.deleteById(id); } -- Gitblit v1.9.3