From b827b2710c1f9ac64fe8879f08e1008a8647966a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 07 七月 2022 13:42:12 +0800
Subject: [PATCH] 大屏数据调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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..bba29bb 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;
@@ -118,7 +118,7 @@
}
if (comActEasyPhotoVO1.getActivityId() != null
- && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)) {
+ && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) {
// 查询随手拍活动
ComActEasyPhotoActivityDO photoActivityDO =
comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
@@ -181,6 +181,17 @@
List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
if (!photoFeedbackList.isEmpty()) {
comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList);
+ }
+
+ List<ComActEasyPhotoFeedbackVO> photoFeedbackListForDpc = comActEasyPhotoFeedbackMapper.getPhotoFeedbackListForDpc(id);
+ if (!photoFeedbackListForDpc.isEmpty()) {
+ comActEasyPhotoVO.setPhotoFeedbackListForDpc(photoFeedbackListForDpc);
+ }
+
+ //处理记录
+ List<ComActEasyPhotoHandlerVo> handleRecordList = easyPhotoHandlerService.selectHandleRecord(id, 1);
+ if (!handleRecordList.isEmpty()) {
+ comActEasyPhotoVO.setHandleRecordList(handleRecordList);
}
// comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
@@ -304,7 +315,10 @@
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.yes);
cmActEasyPhotoDO.setTransferReason(comActEasyPhotoVO.getTransferReason());
cmActEasyPhotoDO.setTransferTime(nowDate);
-
+ } else if (comActEasyPhotoVO.getIsReportDpc().equals(ComActEasyPhotoVO.isReportUrban.yes)) {
+ cmActEasyPhotoDO.setIsReportDpc(ComActEasyPhotoVO.isReportUrban.yes);
+ cmActEasyPhotoDO.setTransferReason(comActEasyPhotoVO.getTransferReason());
+ cmActEasyPhotoDO.setTransferTime(nowDate);
} else {
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
}
@@ -329,8 +343,8 @@
//添加分配人员
if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
comActEasyPhotoVO.getHandleList().forEach(handle -> {
- easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
- ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,comActEasyPhotoVO.getSponsorId());
+ easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(), handle.getUserId()
+ ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,cmActEasyPhotoDO.getSponsorId());
});
}
break;
@@ -357,7 +371,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 +393,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);
@@ -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