From ce34fb4b611a61885c7146e8d776c758b3f366fe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 08 七月 2022 10:11:06 +0800
Subject: [PATCH] 问题清单bug处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 248 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 172 insertions(+), 76 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index a17c5cc..2a5a0df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -10,23 +10,19 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
-import com.panzhihua.service_community.dao.*;
-import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.alibaba.fastjson.JSONObject;
@@ -42,21 +38,15 @@
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActPictureVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
-import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActActivityCode;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -99,6 +89,9 @@
private ComActActivityCodeService comActActivityCodeService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
+
/**
* 新增社区活动
@@ -129,6 +122,12 @@
comActActivityDO.setStatus(3);
}
}
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
+ if(comActActivityVO.getType()==5){
+ comPbCheckUnitDao.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda().eq(ComPbCheckUnit::getAdminPhone,comActActivityVO.getPhone()).last("limit 1"));
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
@@ -150,7 +149,7 @@
ComActActivityCode comActActivityCode = new ComActActivityCode();
comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
comActActivityCode.setCreateTime(new Date());
- comActActivityCode.setType(1);
+ comActActivityCode.setType(comActActivityVO.getType());
comActActivityCode.setStatus(1);
comActActivityCodeService.save(comActActivityCode);
return R.ok(activityId);
@@ -179,7 +178,7 @@
if (!activitySignVOS.isEmpty()) {
try {
WxXCXTempSend util = new WxXCXTempSend();
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
activitySignVOS.forEach(activitySignVO1 -> {
@@ -208,6 +207,7 @@
if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()
&& now.getTime() > comActActivityVO.getSignUpBegin().getTime()) {
comActActivityDO.setStatus(3);
+ comActActivityDO.setPublishAt(new Date());
}
boolean b = this.updateById(comActActivityDO);
if (b) {
@@ -313,10 +313,22 @@
comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
}
List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
- .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
+ .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
if (!regList.isEmpty()) {
List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
comActActivityVO.setTimes(collect.get(0).getTimes());
+ ComActActRegistDO comActActRegistDO=collect.get(0);
+ if(comActActRegistDO.getType()==3){
+ if(comActActRegistDO.getEndTime()==null){
+ comActActivityVO.setSignType(2);
+ }
+ else {
+ comActActivityVO.setSignType(1);
+ }
+ }
+ }
+ else {
+ comActActivityVO.setSignType(1);
}
}
}
@@ -470,6 +482,9 @@
if (isNull(actActivityDO)) {
return R.fail("活动不存在");
}
+ if(actActivityDO.getSignUpBegin().after(new Date())){
+ return R.fail("未到报名时间");
+ }
int num = 0;
ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
.lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
@@ -478,6 +493,7 @@
return R.fail("已经报名过了，请勿重复提交");
}
Integer volunteerMax = actActivityDO.getVolunteerMax();
+ Integer activityType = actActivityDO.getType();
Integer residentMax = actActivityDO.getParticipantMax();
R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
LoginUserInfoVO loginUserInfoVO =
@@ -485,7 +501,7 @@
// 查询当前活动下参与居民
Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
- if (volunteerMax != 0) {
+ if (activityType.equals(1)) {
//志愿者活动
boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
// 查询当前活动下参与志愿者
@@ -542,12 +558,14 @@
comActActSignDO.setCreateAt(new Date());
comActActSignDO.setReason(null);
comActActSignDO.setIsVolunteer(isVolunteer);
+ comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
num = comActActSignDAO.updateById(comActActSignDO);
} else {
comActActSignDO = new ComActActSignDO();
comActActSignDO.setActivityId(activityId);
comActActSignDO.setUserId(userId);
comActActSignDO.setIsVolunteer(isVolunteer);
+ comActActSignDO.setTimes(1);
num = comActActSignDAO.insert(comActActSignDO);
}
} else {
@@ -573,7 +591,7 @@
AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
addComActIntegralUserDTO.setUserId(userId);
addComActIntegralUserDTO.setIntegralType(8);
- addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setActivityType(actActivityDO.getType());
addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
addComActIntegralUserDTO.setServiceId(activityId);
@@ -595,7 +613,7 @@
* @return 活动列表
*/
@Override
- public R listActivity(Long userId, Integer status) {
+ public R listActivity(Long userId, Integer status,Integer type) {
List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
if (ObjectUtils.isEmpty(activitySignVOList)) {
return R.ok();
@@ -613,20 +631,20 @@
.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
}
}
+ if(!isNull(type)){
+ comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
+ }
if (!comActActivityDOS.isEmpty()) {
comActActivityDOS.forEach(comActActivityDO -> {
ComActActivityVO comActActivityVO = new ComActActivityVO();
BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
List<ActivitySignVO> collect = activitySignVOList.stream()
- .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId())).limit(1)
+ .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
.collect(Collectors.toList());
+ comActActivityVO.setSignCount(collect.size());
+ comActActivityVO.setIsComment(0);
+ comActActivityVO.setIsRegist(0);
ActivitySignVO activitySignVO = collect.get(0);
- Integer isVolunteer = activitySignVO.getIsVolunteer();
- if (isVolunteer.intValue() == 1) {
- comActActivityVO.setType(1);
- } else {
- comActActivityVO.setType(2);
- }
Integer activityStatus = comActActivityVO.getStatus();
if (activityStatus.intValue() == 3) {
comActActivityVO.setStatus(4);
@@ -639,9 +657,9 @@
log.error("时间转换异常【{}】", e.getMessage());
}
comActActivityVO.setSingDate(createAt);
- comActActivityVO.setTimes(activitySignVO.getTimes());
Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
comActActivityVO.setAward(totalAward);
+ comActActivityVO.setActivitySignVOList(collect);
comActActivityVOS.add(comActActivityVO);
});
}
@@ -843,7 +861,7 @@
if (!actActivityList.isEmpty()) {
WxXCXTempSend util = new WxXCXTempSend();
try {
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
actActivityList.forEach(actActivity -> {
ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
@@ -899,7 +917,6 @@
if (isNull(activityId)) {
return R.fail("签到所属活动id不能为空！");
}
- if(comActActRegistVO.getActivityType()==1){
ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
if (isNull(comActActivityDO)) {
return R.fail("活动不存在！");
@@ -917,56 +934,87 @@
if (nowDate.before(beginAt) || nowDate.after(endAt)) {
return R.fail("不在活动时间范围内");
}
-
- int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
- .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
- int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
- .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
- if (signDayCount > 0) {
- return R.fail("请扫描新的签到码");
- }
- Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
- boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
- if (isHave) {
- int limit = comActActivityDO.getLimit().intValue();
- if(limit != -1 && signAllCount >= limit){
- return R.fail("签到次数上限");
- }
- }
+ Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
+ boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
// String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
// if (stringRedisTemplate.hasKey(activitySignInKey)) {
// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
// }
ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
- comActActRegistDO.setActivityId(activityId);
- comActActRegistDO.setType(1);
- comActActRegistDO.setUserId(userId);
- comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- comActActRegistDO.setCreateAt(nowDate);
- comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
- comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
- comActActRegistDO.setPosition(comActActRegistVO.getPosition());
- comActActRegistDO.setTimes(signAllCount+1);
- int result = comActActRegistDAO.insert(comActActRegistDO);
- if (result > 0) {
+ if(comActActRegistVO.getSignType()!=null&&comActActRegistVO.getSignType()==2){
+ ComActActRegistDO comActActActRegistDO=comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ if(comActActActRegistDO==null){
+ return R.fail("未签到无法签退");
+ }
+ if(comActActActRegistDO.getEndTime()!=null){
+ return R.fail("无法重复签退");
+ }
+ comActActRegistDO.setId(comActActActRegistDO.getId());
+ comActActRegistDO.setEndTime(new Date());
+ int result=comActActRegistDAO.updateById(comActActRegistDO);
+ if (result > 0) {
+ if (isHave) {
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(6);
+ addComActIntegralUserDTO.setActivityType(2);
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
+ }
+ }
+ else {
+ int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
+ int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
+ .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
+ if (signDayCount > 0) {
+ return R.fail("请扫描新的签到码");
+ }
if (isHave) {
- boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
- AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
- addComActIntegralUserDTO.setUserId(userId);
- addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
- addComActIntegralUserDTO.setActivityType(1);
- addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
- addComActIntegralUserDTO.setServiceId(activityId);
- comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
- return R.ok(comActActivityDO.getRewardIntegral());
- } else {
+ int limit = comActActivityDO.getLimit().intValue();
+ if(limit != -1 && signAllCount >= limit){
+ return R.fail("签到次数上限");
+ }
+ }
+ comActActRegistDO.setActivityId(activityId);
+ comActActRegistDO.setStartTime(new Date());
+ comActActRegistDO.setType(comActActivityDO.getType());
+ comActActRegistDO.setUserId(userId);
+ comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ comActActRegistDO.setCreateAt(nowDate);
+ comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
+ comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
+ comActActRegistDO.setPosition(comActActRegistVO.getPosition());
+ comActActRegistDO.setTimes(signAllCount+1);
+ int result = comActActRegistDAO.insert(comActActRegistDO);
+ if (result > 0&&comActActivityDO.getType()!=3) {
+ if (isHave) {
+ boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
+ AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
+ addComActIntegralUserDTO.setUserId(userId);
+ addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
+ addComActIntegralUserDTO.setActivityType(1);
+ addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
+ addComActIntegralUserDTO.setServiceId(activityId);
+ comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
+ return R.ok(comActActivityDO.getRewardIntegral());
+ } else {
+ return R.ok();
+ }
+ }
+ else {
return R.ok();
}
}
return R.fail("网络错误，请重试");
- }
// else {
// ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
// if (isNull(comPbActivityDO)) {
@@ -1017,8 +1065,6 @@
// }
// return R.fail("网络错误，请重试");
// }
-
- return R.fail("网络错误，请重试");
}
/**
@@ -1087,4 +1133,54 @@
}
return R.ok();
}
+
+ @Override
+ public String getActBelongRegionCode(Long communityId) {
+ return baseMapper.getActBelongRegionCode(communityId);
+ }
+
+ @Override
+ public R partyMemberCount(Long communityId, String year) {
+ PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
+ List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
+ if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
+ if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
+ partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
+ partyActivityTypeChart1.setPercent(partyActivityTypeChart1.getCount()/partyActivityStatics.getActivityCount());
+ });
+ }
+ }
+ partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
+ partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
+ return R.ok(partyActivityStatics);
+ }
+
+ @Override
+ public R partyMemberDetail(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.partyMemberDetail(new Page<>(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R exportPartyMemberDetail(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.exportPartyMemberDetail(commonPage));
+ }
+
+ public List<PartyActivityLine> getPoints(Long communityId,String year){
+ List<PartyActivityLine> partyActivityLines=new ArrayList<>();
+ for(int i=1;i<=12;i++){
+ String x="";
+ if(i<10){
+ x="0"+i;
+ }
+ else {
+ x=i+"";
+ }
+ PartyActivityLine partyActivityLine=new PartyActivityLine();
+ partyActivityLine.setX(i+"月");
+ Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
+ partyActivityLine.setY(y);
+ partyActivityLines.add(partyActivityLine);
+ }
+ return partyActivityLines;
+ }
}
--
Gitblit v1.7.1