From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
index bb56517..ba99382 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.DesensitizedUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -128,6 +129,32 @@
}
return R.ok(iPage);
}
+ @Override
+ public R pageMicroWishAppletsDesensitize(ComActMicroWishVO comActMicroWishVO) {
+ Long userId = comActMicroWishVO.getResponsibleId();
+ IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWishApplets(new Page(comActMicroWishVO.getPageNum()
+ ,comActMicroWishVO.getPageSize()), comActMicroWishVO);
+ List<ComActMicroWishVO> records = iPage.getRecords();
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActMicroWishVO1 -> {
+ if(userId != null){
+ Long id = comActMicroWishVO1.getId();
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
+ .eq(ComActMicroWishUserDO::getUserId, userId));
+ if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
+ comActMicroWishVO1.setHaveGiveThumbsUp(0);
+ } else {
+ comActMicroWishVO1.setHaveGiveThumbsUp(1);
+ }
+ }
+ comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+ comActMicroWishVO1.setSponsorName(DesensitizedUtil.chineseName(comActMicroWishVO1.getSponsorName()));
+ comActMicroWishVO1.setResponsibleName(DesensitizedUtil.chineseName(comActMicroWishVO1.getResponsibleName()));
+ });
+ iPage.setRecords(records);
+ }
+ return R.ok(iPage);
+ }
/**
* 心愿详情
@@ -175,6 +202,59 @@
}
//查询处理人
comActMicroWishVO.setResponsibleName(this.getWishHandleName(comActMicroWishVO.getHandleId()));
+ return R.ok(comActMicroWishVO);
+ }
+ /**
+ * 心愿详情 - 脱敏
+ *
+ * @param id 查询主键
+ * @param userId 登录用户id
+ * @return 心愿内容
+ */
+ @Override
+ public R detailMicroWishDesensitize(Long id, Long userId) {
+ ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
+ if (ObjectUtils.isEmpty(comActMicroWishVO)) {
+ return R.fail("微心愿不存在");
+ }
+ Integer starNum = comActMicroWishVO.getStarNum();
+ if (null==starNum) {
+ comActMicroWishVO.setStarNum(0);
+ }
+ if (ObjectUtils.isEmpty(comActMicroWishVO)) {
+ return R.fail("心愿不存在");
+ }
+ if(userId != null){
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
+ if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
+ comActMicroWishVO.setHaveGiveThumbsUp(0);
+ }else {
+ comActMicroWishVO.setHaveGiveThumbsUp(1);
+ }
+ }
+ //查询反馈列表
+ List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
+ if(!feedList.isEmpty()){
+ for (ComActMicroWishFeedbackVO comActMicroWishFeedbackVO : feedList) {
+ comActMicroWishFeedbackVO.setName(DesensitizedUtil.chineseName(comActMicroWishFeedbackVO.getName()));
+ }
+ comActMicroWishVO.setFeedbackVOList(feedList);
+ }
+ //查询操作记录
+ List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
+ if(!operationList.isEmpty()){
+ comActMicroWishVO.setOperationRecordVOList(operationList);
+ }
+ comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
+ comActMicroWishVO.setSponsorName(DesensitizedUtil.chineseName(comActMicroWishVO.getSponsorName()));
+ comActMicroWishVO.setResponsibleName(DesensitizedUtil.chineseName(comActMicroWishVO.getResponsibleName()));
+ //查询同类型id数组
+ List<Long> idList=comActMicroWishOperationRecordMapper.selectId(comActMicroWishVO);
+ if(!idList.isEmpty()){
+ comActMicroWishVO.setIdList(idList);
+ }
+ //查询处理人
+ comActMicroWishVO.setResponsibleName(DesensitizedUtil.chineseName(this.getWishHandleName(comActMicroWishVO.getHandleId())));
return R.ok(comActMicroWishVO);
}
@@ -252,8 +332,8 @@
//添加分配人员
if(comActMicroWishVO.getHandleList() != null && comActMicroWishVO.getHandleList().size() > 0){
comActMicroWishVO.getHandleList().forEach(handle -> {
- easyPhotoHandlerService.addHandleRecord(microWishDO.getCommunityId(),comActMicroWishVO.getUserId()
- ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY);
+ easyPhotoHandlerService.addHandleRecord(microWishDO.getCommunityId(),handle.getUserId()
+ ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY,comActMicroWishVO.getSponsorId());
});
}
break;
--
Gitblit v1.7.1