From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 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 3a3947b..5965ed5 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
@@ -7,8 +7,8 @@
import javax.annotation.Resource;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
@@ -82,6 +82,8 @@
private ComActEasyPhotoHandlerService easyPhotoHandlerService;
@Resource
private ComActEasyPhotoEvaluateMapper comActEasyPhotoEvaluateMapper;
+ @Resource
+ private ComActReserveRecordMapper comActReserveRecordMapper;
/**
* 分页查询随手拍
*
@@ -118,7 +120,7 @@
}
if (comActEasyPhotoVO1.getActivityId() != null
- && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)) {
+ && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) {
// 查询随手拍活动
ComActEasyPhotoActivityDO photoActivityDO =
comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
@@ -306,9 +308,8 @@
cmActEasyPhotoDO.setTransferTime(nowDate);
} else {
- cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
+ cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no );
}
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -329,7 +330,8 @@
//添加分配人员
if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
comActEasyPhotoVO.getHandleList().forEach(handle -> {
- easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
+ cmActEasyPhotoDO.setHandlerId(handle.getUserId());
+ easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),handle.getUserId()
,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,comActEasyPhotoVO.getSponsorId());
});
}
@@ -357,7 +359,7 @@
comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
break;
case 4:
- if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)) {
+ if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ypj)) {
return R.fail("该随手拍已完成，不可重复操作");
}
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -379,7 +381,7 @@
// comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
// }
cmActEasyPhotoDO.setFeedbackAt(nowDate);
- cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
+ cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.dpj);
cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){
cmActEasyPhotoDO.setUrbanStatus(2);
@@ -387,6 +389,9 @@
break;
default:
break;
+ }
+ if (!ObjectUtils.isEmpty(comActEasyPhotoVO.getIsReportDpc())){
+ cmActEasyPhotoDO.setIsReportDpc(comActEasyPhotoVO.getIsReportDpc());
}
if (!type.equals(3)) {
int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
@@ -622,7 +627,7 @@
SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, grantRewardDTO.getAreaCode()).eq(SysTemplateConfig::getType,7));
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
+ WxUtil.sendSubscribeJLDZ(openid, util.getAccessToken(), "随手拍有奖活动",
grantRewardDTO.getAmount(), activityType,sysTemplateConfig.getTemplateId());
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -717,6 +722,15 @@
//查询社区正在进行中的应用预约/登记列表
List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId);
if(!comActReserveIndexApplicationVos.isEmpty()){
+ comActReserveIndexApplicationVos.forEach(comActReserveIndexVo -> {
+ Integer count=comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().lambda().eq(ComActReserveRecordDO::getReserveId,comActReserveIndexVo.getId()).eq(ComActReserveRecordDO::getUserId,userId));
+ if(count>0){
+ comActReserveIndexVo.setIsCommit(1);
+ }
+ else {
+ comActReserveIndexVo.setIsCommit(2);
+ }
+ });
easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
}
//查询banner
@@ -870,4 +884,45 @@
return R.ok(this.baseMapper.easyPhotoNoHandleIds(communityId));
}
+ /**
+ * 获取人大代表反馈记录
+ * @param id 随手拍id
+ * @return
+ */
+ @Override
+ public R getFeedbackList(Long id) {
+ return R.ok(comActEasyPhotoFeedbackMapper.getPhotoFeedbackListForDpc(id));
+ }
+
+ /**
+ * 人大代表反馈随手拍
+ * @param comActEasyPhotoVO
+ * @return
+ */
+ @Override
+ public R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO) {
+ Date nowDate = new Date();
+ // 操作类型 1审核通过 2驳回 3反馈 4完成随手拍
+ ComActEasyPhotoDO cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
+ if (cmActEasyPhotoDO == null) {
+ return R.fail("未查询到随手拍记录");
+ }
+ if (!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)) {
+ return R.fail("该随手拍不是进行中状态，不可进行反馈");
+ }
+ // 给随手拍新增反馈信息
+ ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
+ photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
+ photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
+ photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
+ photoFeedbackDO.setType(2);
+ photoFeedbackDO.setCreateAt(nowDate);
+ photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
+ int result = comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
+ if (result > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
}
--
Gitblit v1.7.1