From 0a497867115d0d364df6bb6cbddf45f97ffe1576 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 21 May 2024 09:52:51 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AF=B9=E6=8E=A5OA=E8=A1=A5?= =?UTF-8?q?=E5=81=BF=E8=A7=A6=E5=8F=91=E6=8E=A5=E5=8F=A3=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=BB=E5=8A=A8=E6=A8=A1=E6=9D=BF=E5=9B=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbsActivityTemplateController.java | 13 +++++++ .../service/TbsActivityTemplateService.java | 2 ++ .../impl/TbsActivityTemplateServiceImpl.java | 35 +++++++++++++++++++ .../TbsCostApplyOperationServiceImpl.java | 10 ++++++ src/main/java/com/qs/serve/task/BmsTask.java | 11 ++++++ src/main/java/com/qs/serve/task/TbsTask.java | 22 ------------ .../mapper/tbs/TbsCostApplyMapper.xml | 1 + 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index c79101b6..49243f03 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -60,6 +60,7 @@ public class TbsActivityTemplateController { public R> getList(TbsActivityTemplateSo param){ TbsActivityTemplate entity = CopierUtil.copy(param,new TbsActivityTemplate()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + lqw.orderByDesc(TbsActivityTemplate::getTemplateState); PageUtil.startPage(); List list = tbsActivityTemplateService.list(lqw); return R.ok(list); @@ -138,6 +139,18 @@ public class TbsActivityTemplateController { return R.ok(template); } + /** + * 更新状态 + * @return + */ + @PostMapping("/updateState2") + @SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.UPDATE) + @PreAuthorize("hasRole('tbs:activityTemplate:update')") + public R updateState(){ + tbsActivityTemplateService.updateState(); + return R.ok(); + } + /** * 新增 * @param param diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateService.java index 766981fd..a73ec472 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateService.java @@ -13,5 +13,7 @@ public interface TbsActivityTemplateService extends IService lqw = new LambdaQueryWrapper<>(); + lqw.select(TbsActivityTemplate::getId); + lqw.le(TbsActivityTemplate::getStartTime,nowTime); + lqw.and(qw-> + qw.ge(TbsActivityTemplate::getEndTime,nowTime) + .or() + .isNull(TbsActivityTemplate::getEndTime) + ); + lqw.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.eq(TbsActivityTemplate::getTemplateState,1); + List preCloseList = this.list(lqw2); + if(CollectionUtil.isNotEmpty(preCloseList)){ + preCloseList.forEach(a->a.setTemplateState(0)); + this.updateBatchById(preCloseList); + } + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index a00a9833..f8b2e535 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; @@ -218,6 +219,15 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService for (CtpAffair ctpAffair : ctpAffairs) { CtpAffairVo ctpAffairVo = new CtpAffairVo(); ctpAffairVo.setAffairInfo(ctpAffair); + //2已发 + if(ctpAffair!=null&&ctpAffair.getState().equals(2)){ + String costId = ctpAffair.getCostApplyId(); + if(costId!=null){ + TbsCostApply costApply1 = costApplyService.getById(costId); + Date date = Date.from(costApply1.getSubmitTime().atZone(ZoneId.systemDefault()).toInstant()); + ctpAffair.setCommentTime(date); + } + } for (SysUser user : userList) { if(ctpAffair.getMemberId().equals(user.getSyUserId())){ ctpAffairVo.setUserInfo(user.toSysUserVo()); diff --git a/src/main/java/com/qs/serve/task/BmsTask.java b/src/main/java/com/qs/serve/task/BmsTask.java index 92f8d2f9..09d945d2 100644 --- a/src/main/java/com/qs/serve/task/BmsTask.java +++ b/src/main/java/com/qs/serve/task/BmsTask.java @@ -3,6 +3,7 @@ package com.qs.serve.task; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.modules.bms.controller.BmsRegion2Controller; import com.qs.serve.modules.bms.controller.BmsRegionController; +import com.qs.serve.modules.tbs.service.TbsActivityTemplateService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -21,6 +22,7 @@ public class BmsTask { private final BmsRegion2Controller bmsRegion2Controller; private final BmsRegionController bmsRegionController; + private final TbsActivityTemplateService tbsActivityTemplateService; /** * 更新树路径 @@ -31,7 +33,16 @@ public class BmsTask { bmsRegionController.updateLevel(); bmsRegion2Controller.updateLevel(); //更新客户的关联区域的列 + tbsActivityTemplateService.updateState(); } + /** + * 5分钟执行一次 + */ + @Scheduled(cron="0 0/5 * * * ?") + public void updateActTmpState(){ + AuthContextUtils.setTenant("001"); + tbsActivityTemplateService.updateState(); + } } diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java index 5e8a96f5..f8143e5d 100644 --- a/src/main/java/com/qs/serve/task/TbsTask.java +++ b/src/main/java/com/qs/serve/task/TbsTask.java @@ -84,29 +84,7 @@ public class TbsTask { //启用和停用模板规则 @Scheduled(cron="0 0 1 * * ?") public void task2(){ - AuthContextUtils.setTenant("001"); - LocalDateTime nowTime = LocalDateTime.now(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.select(TbsActivityTemplate::getId); - lqw.ge(TbsActivityTemplate::getStartTime,nowTime.with(LocalDateTime.MIN)); - lqw.le(TbsActivityTemplate::getStartTime,nowTime.with(LocalDateTime.MAX)); - lqw.eq(TbsActivityTemplate::getTemplateState,0); - List preStartList = activityTemplateService.list(lqw); - if(CollectionUtil.isNotEmpty(preStartList)){ - preStartList.forEach(a->a.setTemplateState(1)); - activityTemplateService.updateBatchById(preStartList); - } - LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); - lqw2.select(TbsActivityTemplate::getId); - lqw2.ge(TbsActivityTemplate::getEndTime,nowTime.with(LocalDateTime.MIN)); - lqw2.le(TbsActivityTemplate::getEndTime,nowTime.with(LocalDateTime.MAX)); - lqw2.eq(TbsActivityTemplate::getTemplateState,1); - List preCloseList = activityTemplateService.list(lqw2); - if(CollectionUtil.isNotEmpty(preCloseList)){ - preCloseList.forEach(a->a.setTemplateState(0)); - activityTemplateService.updateBatchById(preCloseList); - } } diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index 4d150aa5..3403822d 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -221,6 +221,7 @@ and `tbs_cost_apply`.`tenant_id` = #{query.tenantId} and `tbs_cost_apply`.`create_by` = #{query.createBy} and `tbs_cost_apply`.`update_by` = #{query.updateBy} + and `tbs_cost_apply`.`ext_user_name` like concat('%', #{query.extUserName},'%') and `tbs_cost_apply`.`del_flag` = #{query.delFlag} and `tbs_cost_apply`.`template_title` like concat('%', #{query.templateTitle},'%')