From 4a9f0ebf8962273f7f10486ffd1e2ba120da8ca2 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 18 Jul 2024 10:15:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E6=A8=A1=E6=9D=BF=E5=90=8C=E6=AD=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/seeyon/SeeYonController.java | 2 +- .../tbs/controller/TbsBudgetController.java | 2 +- .../impl/TbsActivityTemplateServiceImpl.java | 31 +++++++++++-------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java index 0d6d7c6c..c59c9489 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java +++ b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java @@ -213,7 +213,7 @@ public class SeeYonController { for (Object o : pageVo.getList()) { String json = JsonUtil.objectToJson(o); SeeYonApproveDataVo obj = JsonUtil.jsonToPojo(json,SeeYonApproveDataVo.class); - if(obj!=null&&obj.getTargetCode()!=null){ + if(obj!=null&&obj.getTemplateCode()!=null){ //tempCode不参与业务。统一类型重新赋值，方便前端跳转 String tempCode = obj.getTemplateCode().replace("_Test",""); tempCode = tempCode.replace("contractApply","CostBill"); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 6ea47170..51061167 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -460,7 +460,7 @@ public class TbsBudgetController { new LambdaQueryWrapper() .in(TbsBudget::getId,idsLong) .eq(TbsBudget::getBudgetState,0) - .eq(TbsBudget::getBudgetCheckState,TbsCommonCheckState.State_0_unPublish) + .ne(TbsBudget::getBudgetCheckState,TbsCommonCheckState.State_0_unPublish) ); if(countUnPub>0){ return R.error("预算状态不支持删除"); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java index 17d3b53b..2aefd2b3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java @@ -115,34 +115,39 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.select(TbsActivityTemplate::getId); - lqw.le(TbsActivityTemplate::getStartTime,nowTime); - lqw.and(qw-> - qw.ge(TbsActivityTemplate::getEndTime,nowTime) + lqw.select( + TbsActivityTemplate::getId, + TbsActivityTemplate::getStartTime, + TbsActivityTemplate::getEndTime + ) + .le(TbsActivityTemplate::getStartTime,nowTime) + .and(qw->{ + qw.isNull(TbsActivityTemplate::getEndTime) .or() - .isNull(TbsActivityTemplate::getEndTime) - ); - lqw.eq(TbsActivityTemplate::getTemplateState,0); + .ge(TbsActivityTemplate::getEndTime,nowTime); + }) + .eq(TbsActivityTemplate::getTemplateState,0); List preStartList = this.list(lqw); if(CollectionUtil.isNotEmpty(preStartList)){ preStartList.forEach(a->a.setTemplateState(1)); this.updateBatchById(preStartList); } + //关闭超时模板 LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); - lqw2.select(TbsActivityTemplate::getId); - lqw2.and(a-> - a.ge(TbsActivityTemplate::getStartTime,nowTime) - .or() - .le(TbsActivityTemplate::getEndTime,nowTime) - ); + lqw2.select(TbsActivityTemplate::getId, + TbsActivityTemplate::getStartTime, + TbsActivityTemplate::getEndTime); + lqw2.le(TbsActivityTemplate::getEndTime,nowTime); lqw2.eq(TbsActivityTemplate::getTemplateState,1); List preCloseList = this.list(lqw2); if(CollectionUtil.isNotEmpty(preCloseList)){ preCloseList.forEach(a->a.setTemplateState(0)); this.updateBatchById(preCloseList); } + } }