From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index 6f776ae..ad42d5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -65,6 +65,10 @@
private ComActEasyPhotoFeedbackMapper comActEasyPhotoFeedbackMapper;
@Resource
private ComActQuestnaireDAO comActQuestnaireDAO;
+ @Resource
+ private ComActReserveMapper comActReserveMapper;
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
/**
* 分页查询随手拍
@@ -286,8 +290,8 @@
cmActEasyPhotoDO.setTransferTime(nowDate);
} else {
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -352,6 +356,9 @@
cmActEasyPhotoDO.setFeedbackAt(nowDate);
cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
+ if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){
+ cmActEasyPhotoDO.setUrbanStatus(2);
+ }
break;
default:
break;
@@ -664,13 +671,28 @@
easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList);
}
+ //查询社区正在进行中的banner位置的社区活动
+ List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId);
+ if (!comActActivityVOList.isEmpty()) {
+ easyPhotoRewardVO.setBannerActivityList(comActActivityVOList);
+ }
+
// 查询社区正在进行中的应用位置调查问卷列表
List<ComActQuestnaireAppVO> applicationQuestnaireList =
comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId);
if (!applicationQuestnaireList.isEmpty()) {
easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList);
}
-
+ //查询社区正在进行中的banner预约/登记列表
+ List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId);
+ if(!comActReserveIndexVos.isEmpty()){
+ easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos);
+ }
+ //查询社区正在进行中的应用预约/登记列表
+ List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId);
+ if(!comActReserveIndexApplicationVos.isEmpty()){
+ easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
+ }
return R.ok(easyPhotoRewardVO);
}
--
Gitblit v1.7.1