From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 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 6f31a02..a7088ca 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
@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
@@ -57,19 +59,21 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO);
+
List<ComActMicroWishVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActMicroWishVO1 -> {
- 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);
+ 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()));
-
});
iPage.setRecords(records);
}
@@ -96,11 +100,13 @@
if (ObjectUtils.isEmpty(comActMicroWishVO)) {
return R.fail("心愿不存在");
}
- 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);
+ 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);
+ }
}
comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
return R.ok(comActMicroWishVO);
@@ -147,6 +153,9 @@
comActMicroWishDO.setForm(2);
break;
case 5:
+ if(comActMicroWishVO.getFeedback().length() > 200){
+ return R.fail("反馈字数不得超过200字");
+ }
comActMicroWishDO.setFeedbackAt(date);
comActMicroWishDO.setStatus(5);//待确认
comActMicroWishDO.setFeedback(feedback);
@@ -260,4 +269,17 @@
log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
return R.ok();
}
+
+ @Override
+ public R getScreenMicroList(ScreenMicroListDTO microListDTO){
+ IPage<MicroListVO> microListVOIPage = comActMicroWishDAO.getScreenMicroList(new Page(microListDTO.getPageNum(),microListDTO.getPageSize()),microListDTO);
+ if(!microListVOIPage.getRecords().isEmpty()){
+ microListVOIPage.getRecords().forEach(microListVO -> {
+ Integer count = comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda()
+ .eq(ComActMicroWishUserDO::getMicroWishId,microListVO.getId()));
+ microListVO.setStarNum(count);
+ });
+ }
+ return R.ok(microListVOIPage);
+ }
}
--
Gitblit v1.7.1