From 5da6b2e80f6c54d07ce60b228bf668a1e6ec6be6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 17:01:41 +0800
Subject: [PATCH] 修改杨家坪社区问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
index 93d0ee7..f88f293 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
@@ -68,6 +68,12 @@
if (isNull(comActActivityDO)) {
return R.fail("活动不存在");
}
+ ComActActSignDO comActActSignDO = comActActSignDAO
+ .selectOne(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, activityId)
+ .eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getStatus, 1));
+ if (isNull(comActActSignDO)) {
+ return R.fail("活动未报名");
+ }
Date beginAt = comActActivityDO.getBeginAt();
Date nowDate = new Date();
Integer isQrCode = comActActivityDO.getIsQrCode();
@@ -88,6 +94,7 @@
}
ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO();
BeanUtils.copyProperties(comActActEvaluateVO, comActActEvaluateDO);
+ comActActEvaluateDO.setSignIdentity(comActActSignDO.getSignIdentity());
int result = this.baseMapper.insert(comActActEvaluateDO);
if (result < 0) {
return R.fail("评论失败，请重试");
@@ -114,7 +121,7 @@
List<ComActActEvaluateDO> comActActEvaluateDOList = comActActSignDOS.stream().map(comActActSignDO -> {
ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO();
comActActEvaluateDO.setActivityId(comActActSignDO.getActivityId());
- comActActEvaluateDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ comActActEvaluateDO.setSignIdentity(comActActSignDO.getSignIdentity());
comActActEvaluateDO.setUserId(comActActSignDO.getUserId());
comActActEvaluateDO.setCreateAt(new Date());
comActActEvaluateDO.setStarLevel(5);
@@ -170,22 +177,13 @@
if (isNull(comActActivityDO)) {
return R.fail("活动不存在");
}
- List<ComActActEvaluateDO> comActActEvaluateDOList = this.baseMapper.selectList(new QueryWrapper<ComActActEvaluateDO>()
- .lambda().eq(ComActActEvaluateDO::getUserId, userId).eq(ComActActEvaluateDO::getActivityId, activityId));
- List<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>();
- if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) {
- comActActEvaluateDOList.forEach(comActActEvaluateDO -> {
- ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO();
- BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO);
- comActActEvaluateVOS.add(comActActEvaluateVO);
- });
- }
- int registCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ List<ComActActEvaluateVO> comActActEvaluateVOS = this.baseMapper.selectEvaluateList(activityId, userId);
+ int regCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
.lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
MyActivityEvaluateVO evaluateVO = new MyActivityEvaluateVO();
evaluateVO.setMyEvaluateList(comActActEvaluateVOS);
- boolean needDisplay = registCount > comActActEvaluateVOS.size() &&
+ boolean needDisplay = regCount > comActActEvaluateVOS.size() &&
new Date().before(DateUtils.addDays(comActActivityDO.getEndAt(), 3));
evaluateVO.setIsDisplay(needDisplay ? 1 : 0);
return R.ok(evaluateVO);
--
Gitblit v1.7.1