From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 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 4361752..03f1a20 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
@@ -21,10 +21,12 @@
import com.panzhihua.service_community.dao.ComActMicroWishFeedbackMapper;
import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
+import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
+import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,8 @@
private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper;
@Resource
private ComActMicroWishOperationRecordService wishOperationRecordService;
+ @Resource
+ private ComActEasyPhotoHandlerService easyPhotoHandlerService;
/**
* 分页查询微心愿
*
@@ -244,6 +248,14 @@
comActMicroWishOperationRecordDO.setRemark("分配心愿");
comActMicroWishOperationRecordDO.setUserId(responsibleId);
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
+
+ //添加分配人员
+ if(comActMicroWishVO.getHandleList() != null && comActMicroWishVO.getHandleList().size() > 0){
+ comActMicroWishVO.getHandleList().forEach(handle -> {
+ easyPhotoHandlerService.addHandleRecord(microWishDO.getCommunityId(),handle.getUserId()
+ ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY,comActMicroWishVO.getSponsorId());
+ });
+ }
break;
case 4:
isUpdate = true;
@@ -496,25 +508,21 @@
IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWishAdmin(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);
- }
+ iPage.getRecords().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.setResponsibleName(this.getWishHandleName(comActMicroWishVO1.getHandleId()));
- });
- iPage.setRecords(records);
- }
+ }
+ comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+ //查询处理人
+ comActMicroWishVO1.setResponsibleName(this.getWishHandleName(comActMicroWishVO1.getHandleId()));
+ });
return R.ok(iPage);
}
}
--
Gitblit v1.7.1