From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index 48376b3..67dffb0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -489,10 +489,12 @@
// 修改报名状态为报名中
int num1=comBpActivityDAO.updateStatusToSign();
log.info("定时任务修改党建活动--修改报名状态为报名中始数量【{}】",num1);
+ //查询已结束的活动id,便于计算用户积分
+ List<Long> pbActivityEndIds = comBpActivityDAO.getTaskPbActivityEndIds();
// 修改进行状态为进行中 或者已结束
int num2=comBpActivityDAO.updateStatusToActiveOrEnd();
log.info("定时任务修改党建活动--修改进行状态为进行中 或者已结束数量【{}】",num2);
- return R.ok(comBpActivityDAO.getTaskPbActivityEndIds());
+ return R.ok(pbActivityEndIds);
}
/**
--
Gitblit v1.7.1