From 4bc923708d705b751d79fc6e179742c19602ebf3 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 13 Jul 2023 00:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qs/serve/task/TbsTask.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java
index de488721..96efdb0d 100644
--- a/src/main/java/com/qs/serve/task/TbsTask.java
+++ b/src/main/java/com/qs/serve/task/TbsTask.java
@@ -6,16 +6,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.tbs.service.TbsActivityTemplateService;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.stream.Collectors;
 
 /**
  * @author YenHex
@@ -27,6 +31,7 @@ import java.time.LocalDateTime;
 public class TbsTask {
 
     private final TbsActivityService activityService;
+    private final TbsCostApplyService tbsCostApplyService;
     private final TbsActivityTemplateService activityTemplateService;
 
 
@@ -34,7 +39,15 @@ public class TbsTask {
     @Scheduled(cron="0 0 1 * * ?")
     public void task1(){
         AuthContextUtils.setTenant("001");
+        LambdaQueryWrapper<TbsCostApply> lqwApply = new LambdaQueryWrapper<>();
+        lqwApply.select(TbsCostApply::getId);
+        lqwApply.eq(TbsCostApply::getChargeState, TbsCostApplyState.State_2_actioning.getCode());
+        List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqwApply);
+        List<Long> costApplyIds = costApplyList.stream().map(a->a.getId()).collect(Collectors.toList());
+        //只更新审批完成的申请活动状态
+
         LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>();
+        lqw.in(TbsActivity::getCostApplyId,costApplyIds);
         lqw.le(TbsActivity::getPreCheckDate, LocalDate.now());
         lqw.eq(TbsActivity::getReopenFlag,0);
         TbsActivity param = new TbsActivity();