From f73605bf29c99b77036f894076a2f8d46783df10 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 07 九月 2021 16:34:16 +0800
Subject: [PATCH] 小程序分页查询活动列表时返回活动报名列表
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 279 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 185 insertions(+), 94 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 957c865..cb25b95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -10,6 +10,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -85,32 +88,6 @@
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
-import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
-import com.panzhihua.service_community.model.dos.ComActDynDO;
-import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
-import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
-import com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO;
-import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
-import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
-import com.panzhihua.service_community.model.dos.EldersAuthDO;
-import com.panzhihua.service_community.service.ComActActEvaluateService;
-import com.panzhihua.service_community.service.ComActActPrizeService;
-import com.panzhihua.service_community.service.ComActActivityService;
-import com.panzhihua.service_community.service.ComActDynService;
-import com.panzhihua.service_community.service.ComActEasyPhotoActivityService;
-import com.panzhihua.service_community.service.ComActEasyPhotoService;
-import com.panzhihua.service_community.service.ComActMessageService;
-import com.panzhihua.service_community.service.ComActMicroWishService;
-import com.panzhihua.service_community.service.ComActQuestnaireService;
-import com.panzhihua.service_community.service.ComActService;
-import com.panzhihua.service_community.service.ComEldersAuthUserService;
-import com.panzhihua.service_community.service.ComMngStructAreaDistrictService;
-import com.panzhihua.service_community.service.ComMngStructAreaService;
-import com.panzhihua.service_community.service.ComMngStructHouseService;
-import com.panzhihua.service_community.service.ComMngStructOtherBuildService;
-import com.panzhihua.service_community.service.ComMngVolunteerMngService;
-import com.panzhihua.service_community.service.EldersAuthService;
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
@@ -167,6 +144,8 @@
private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
@Resource
private ComActActEvaluateService comActActEvaluateService;
+ @Resource
+ private ComEldersAuthElderlyService comEldersAuthElderlyService;
/**
* 新增社区活动
@@ -298,6 +277,7 @@
} else {
comActActivityVO1.setType(2);
}
+ fillActivitySignList(id, comActActivityVO1);
});
page.setRecords(content);
}
@@ -402,9 +382,20 @@
}
}
});
+ fillActivitySignList(id, comActActivityVO);
+ comActActivityVO.setIntegral(0);
+ return R.ok(comActActivityVO);
+ }
+
+ /**
+ * 填充活动报名名单
+ * @param activityId 活动id
+ * @param comActActivityVO 需填充VO
+ */
+ private void fillActivitySignList(Long activityId, ComActActivityVO comActActivityVO) {
//活动报名名单
ActivitySignVO activitySignVO = new ActivitySignVO();
- activitySignVO.setActivityId(id);
+ activitySignVO.setActivityId(activityId);
R r = comActActivityService.listActivitySigns(activitySignVO);
if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS =
@@ -438,8 +429,6 @@
}
}
- comActActivityVO.setIntegral(0);
- return R.ok(comActActivityVO);
}
/**
@@ -511,6 +500,18 @@
}
/**
+ * description getSignLists 查询活动报名名单
+ * @param activitySignVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("activity/sign/getList")
+ public R getSignLists(@RequestBody ActivitySignVO activitySignVO){
+ return comActActivityService.getSignLists(activitySignVO);
+ }
+
+ /**
* description listActivityRegists 分页查询活动评价
* @param comActActEvaluateVO 活动评价vo
* @return R 分页查询结果
@@ -518,20 +519,92 @@
* @date 2021/8/24 14:03
*/
@PostMapping("activity/evaluate/page")
- public R pageActivityRegists(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
- return comActActivityService.pageActivityRegists(comActActEvaluateVO);
+ public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+ return comActActivityService.pageActivityEvaluates(comActActEvaluateVO);
}
/**
- * description getEvaluateListsByIds 批量查询活动评价
- * @param ids ids
+ * description getEvaluateLists 查询活动评价
+ * @param comActActEvaluateVO 查询参数
* @return R 查询结果
* @author txb
* @date 2021/8/24 14:03
*/
- @PostMapping("/activity/evaluate/getList")
- public R getEvaluateListsByIds(@RequestBody List<Long> ids){
- return comActActivityService.getEvaluateListsByIds(ids);
+ @PostMapping("activity/evaluate/getList")
+ public R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO){
+ return comActActivityService.getEvaluateLists(comActActEvaluateVO);
+ }
+
+ /**
+ * description pageActivityRegists 分页查询活动签到
+ * @param comActActRegistVO 活动签到vo
+ * @return R 分页查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("activity/regist/page")
+ public R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO) {
+ return comActActivityService.pageActivityRegists(comActActRegistVO);
+ }
+
+ /**
+ * description getRegistLists 查询活动签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("activity/regist/getList")
+ public R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO){
+ return comActActivityService.getRegistLists(comActActRegistVO);
+ }
+
+ /**
+ * description getRegistLists 查询活动未签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("activity/noRegist/getList")
+ public R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO){
+ return comActActivityService.getNoRegistLists(comActActRegistVO);
+ }
+
+ /**
+ * description activityStagistics 活动数据统计
+ * @param activityId 活动id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/25 13:33
+ */
+ @GetMapping("activity/statistics")
+ public R activityStatistics(@RequestParam("activityId") Long activityId){
+ return comActActivityService.activityStatistics(activityId);
+ }
+
+ /**
+ * 获取活动历史封面 getPictureList
+ * @param userId 用户id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/picture/getList")
+ public R getPictureList(@RequestParam("userId") Long userId){
+ return comActActivityService.getPictureList(userId);
+ }
+
+ /**
+ * 获取系统预置图库 getSysPictureList
+ * @param type 图库类型
+ * @return R 系统图库集
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/sysPicture/getList")
+ public R getSysPictureList(@RequestParam(value = "type") Integer type){
+ return comActActivityService.getSysPictureList(type);
}
/**
@@ -2049,67 +2122,71 @@
if (authUserDO == null) {
return R.fail("未查询到老人信息");
}
-
- Long elderId = authUserDO.getId();
- boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
- if (!canReAuthThisMonth) {
- return R.fail("当月已认证，不能再次进行认证");
- }
-
+ //根据身份证获取出生日期并获取岁数
String idCard = authUserDO.getIdCard();
-
- Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
- EldersAuthDO eldersAuthDO = new EldersAuthDO();
- eldersAuthDO.setSumitUserId(loginUserId);
- eldersAuthDO.setCreateBy(loginUserId);
- eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(idCard);
- eldersAuthDO.setAuthUserName(authUserDO.getName());
- eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
- eldersAuthDO.setFamilyUserId(authUserDO.getId());
- eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
- // 根据身份证查询出籍贯 出生日期
- // String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
- String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
- if (StringUtils.isEmpty(domicile)) {
- domicile = "暂无";
- }
-
Date birthDay = IdCard.birthDay(idCard);
- eldersAuthDO.setDomicile(domicile);
- eldersAuthDO.setBirthDay(birthDay);
- int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
- if (add == 1) {
- // 设置认证成功
- Long familyUserId = eldersAuthDO.getFamilyUserId();
- ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
- comEldersAuthUserDO.setId(familyUserId);
- comEldersAuthUserDO.setIsAuth(1);
- boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
- if (!updated) {
- throw new ServiceException("添加认证失败，更新认证状态");
- }
- // 认证成功 添加认证记录
- List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList =
- comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
- .eq(ComEldersAuthHistoryRecordDO::getIdCard, idCard)
- .ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
- if (authHistoryRecordDOList.isEmpty()) {
- ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
- authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
- authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
- BeanUtils.copyProperties(eldersAuthDO, authHistoryRecordDO);
- authHistoryRecordDO.setId(null);
- authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
- authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
- authHistoryRecordDO.setIsAuth(1);
- authHistoryRecordDO.setDomicile(domicile);
- comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
- }
- return R.ok(eldersAuthDO.getId());
- }
+ long year=DateUtil.betweenYear(birthDay,DateUtil.date(),true);
+ if(authUserDO.getBigAgeId()!=null){
+ ComEldersAuthElderlyDO comEldersAuthElderlyDO=comEldersAuthElderlyService.getById(authUserDO.getBigAgeId());
+ if(comEldersAuthElderlyDO!=null&&comEldersAuthElderlyDO.getIsExist()==ComEldersAuthElderlyDO.isExist.yes&&comEldersAuthElderlyDO.getIsBigAge()==ComEldersAuthElderlyDO.isBigAge.yes&&year>=80){
+ Long elderId = authUserDO.getId();
+ boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
+ if (!canReAuthThisMonth) {
+ return R.fail("当月已认证，不能再次进行认证");
+ }
+ Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
+ EldersAuthDO eldersAuthDO = new EldersAuthDO();
+ eldersAuthDO.setSumitUserId(loginUserId);
+ eldersAuthDO.setCreateBy(loginUserId);
+ eldersAuthDO.setCreateAt(new Date());
+ eldersAuthDO.setIdCard(idCard);
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
+ eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
+ // 根据身份证查询出籍贯 出生日期
+ // String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+ if (StringUtils.isEmpty(domicile)) {
+ domicile = "暂无";
+ }
+ eldersAuthDO.setDomicile(domicile);
+ eldersAuthDO.setBirthDay(birthDay);
+ int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
+ if (add == 1) {
+ // 设置认证成功
+ Long familyUserId = eldersAuthDO.getFamilyUserId();
+ ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
+ comEldersAuthUserDO.setId(familyUserId);
+ comEldersAuthUserDO.setIsAuth(1);
+ boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
+ if (!updated) {
+ throw new ServiceException("添加认证失败，更新认证状态");
+ }
+ // 认证成功 添加认证记录
+ List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList =
+ comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
+ .eq(ComEldersAuthHistoryRecordDO::getIdCard, idCard)
+ .ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ if (authHistoryRecordDOList.isEmpty()) {
+ ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
+ authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
+ BeanUtils.copyProperties(eldersAuthDO, authHistoryRecordDO);
+ authHistoryRecordDO.setId(null);
+ authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
+ authHistoryRecordDO.setIsAuth(1);
+ authHistoryRecordDO.setDomicile(domicile);
+ comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
+ }
+ return R.ok(eldersAuthDO.getId());
+ }
- return R.fail();
+ }
+ return R.fail("不满足认证条件");
+ }
+ return R.fail("未查询到高龄老人库数据");
}
/**
@@ -2246,6 +2323,20 @@
}
/**
+ * 获取首页弹窗接口
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ @PostMapping("easyphoto/getUserRewards")
+ public R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.getUserReward(userId, communityId);
+ }
+
+ /**
* 读取用户随手拍奖励
*
* @param userId
--
Gitblit v1.7.1