From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 130 +++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 55 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 a7088ca..5d7a6aa 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,5 +1,13 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,13 +24,8 @@
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import com.panzhihua.service_community.service.ComActMicroWishService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,7 +35,8 @@
**/
@Service
@Slf4j
-public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
+public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO>
+ implements ComActMicroWishService {
@Resource
private ComActMicroWishDAO comActMicroWishDAO;
@Resource
@@ -41,7 +45,8 @@
/**
* 分页查询微心愿
*
- * @param comActMicroWishVO 查询参数
+ * @param comActMicroWishVO
+ * 查询参数
* @return 心愿列表
*/
@Override
@@ -50,10 +55,10 @@
Page page = new Page<>();
Long pageNum = comActMicroWishVO.getPageNum();
Long pageSize = comActMicroWishVO.getPageSize();
- if (null==pageNum || 0 == pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize || 0 == pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -63,9 +68,10 @@
List<ComActMicroWishVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActMicroWishVO1 -> {
- if(userId != null){
+ if (userId != null) {
Long id = comActMicroWishVO1.getId();
- ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(
+ new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
.eq(ComActMicroWishUserDO::getUserId, userId));
if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
comActMicroWishVO1.setHaveGiveThumbsUp(0);
@@ -73,7 +79,8 @@
comActMicroWishVO1.setHaveGiveThumbsUp(1);
}
}
- comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+ comActMicroWishVO1
+ .setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
});
iPage.setRecords(records);
}
@@ -83,8 +90,10 @@
/**
* 心愿详情
*
- * @param id 查询主键
- * @param userId 登录用户id
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
* @return 心愿内容
*/
@Override
@@ -94,17 +103,19 @@
return R.fail("微心愿不存在");
}
Integer starNum = comActMicroWishVO.getStarNum();
- if (null==starNum) {
+ 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 (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 {
+ } else {
comActMicroWishVO.setHaveGiveThumbsUp(1);
}
}
@@ -115,7 +126,8 @@
/**
* 审核、分配、反馈心愿
*
- * @param comActMicroWishVO 具体操作
+ * @param comActMicroWishVO
+ * 具体操作
* @return 操作结果
*/
@Override
@@ -126,38 +138,38 @@
Long responsibleId = comActMicroWishVO.getResponsibleId();
String feedback = comActMicroWishVO.getFeedback();
String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
- ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
+ ComActMicroWishDO comActMicroWishDO = new ComActMicroWishDO();
comActMicroWishDO.setId(id);
Date date = new Date();
-// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
- switch (type){
+ // 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
+ switch (type) {
case 1:
comActMicroWishDO.setExamineAt(date);
- comActMicroWishDO.setStatus(2);//待分配
+ comActMicroWishDO.setStatus(2);// 待分配
break;
case 2:
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
- comActMicroWishDO.setStatus(4);//驳回
+ comActMicroWishDO.setStatus(4);// 驳回
break;
case 3:
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);//进行中
+ comActMicroWishDO.setStatus(3);// 进行中
comActMicroWishDO.setForm(1);
break;
case 4:
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);//待确认
+ comActMicroWishDO.setStatus(3);// 待确认
comActMicroWishDO.setForm(2);
break;
case 5:
- if(comActMicroWishVO.getFeedback().length() > 200){
+ if (comActMicroWishVO.getFeedback().length() > 200) {
return R.fail("反馈字数不得超过200字");
}
comActMicroWishDO.setFeedbackAt(date);
- comActMicroWishDO.setStatus(5);//待确认
+ comActMicroWishDO.setStatus(5);// 待确认
comActMicroWishDO.setFeedback(feedback);
comActMicroWishDO.setFinish(feedback);
comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
@@ -168,7 +180,7 @@
break;
}
int update = comActMicroWishDAO.updateById(comActMicroWishDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -177,7 +189,8 @@
/**
* 点赞/取消点赞微心愿
*
- * @param comActMicroWishVO 操作参数
+ * @param comActMicroWishVO
+ * 操作参数
* @return 操作结果
*/
@Override
@@ -185,26 +198,28 @@
Integer haveGiveThumbsUp = comActMicroWishVO.getHaveGiveThumbsUp();
Long userId = comActMicroWishVO.getSponsorId();
Long microWishId = comActMicroWishVO.getId();
- ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
+ ComActMicroWishUserDO comActMicroWishUserDO =
+ comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda()
+ .eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO);
- int num=0;
- if (haveGiveThumbsUp.intValue()==1) {
+ int num = 0;
+ if (haveGiveThumbsUp.intValue() == 1) {
if (empty) {
- ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO();
+ ComActMicroWishUserDO comActMicroWishUserDO1 = new ComActMicroWishUserDO();
comActMicroWishUserDO1.setMicroWishId(microWishId);
comActMicroWishUserDO1.setUserId(userId);
- num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
- }else{
+ num = comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
+ } else {
return R.ok();
}
- }else {
+ } else {
if (empty) {
return R.ok();
} else {
- num= comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId());
+ num = comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId());
}
}
- if (num>0) {
+ if (num > 0) {
return R.ok();
}
return R.fail();
@@ -213,7 +228,8 @@
/**
* 用户确认心愿
*
- * @param comActMicroWishVO 用户评价
+ * @param comActMicroWishVO
+ * 用户评价
* @return 确认结果
*/
@Override
@@ -223,17 +239,17 @@
return R.fail("心愿不存在");
}
Integer status = comActMicroWishDO1.getStatus();
- if (status.intValue()!=5) {
+ if (status.intValue() != 5) {
return R.fail("心愿状态不是待确认");
}
- ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
+ ComActMicroWishDO comActMicroWishDO = new ComActMicroWishDO();
comActMicroWishDO.setId(comActMicroWishVO.getId());
comActMicroWishDO.setEvaluateAt(comActMicroWishVO.getEvaluateAt());
comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
comActMicroWishDO.setScore(comActMicroWishVO.getScore());
comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate());
int update = comActMicroWishDAO.updateById(comActMicroWishDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -242,41 +258,45 @@
/**
* 社区首页代办事件集合
*
- * @param communityId 社区id
- * @param userId 登录用户
+ * @param communityId
+ * 社区id
+ * @param userId
+ * 登录用户
* @return 代办事件集合
*/
@Override
public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
- List<TodoEventsVO> todoEventsVOS=comActMicroWishDAO.selectNeedToDo(communityId,userId);
+ List<TodoEventsVO> todoEventsVOS = comActMicroWishDAO.selectNeedToDo(communityId, userId);
return todoEventsVOS;
}
@Override
public R deleteMicroWish(Long id) {
ComActMicroWishDO comActMicroWishDO = comActMicroWishDAO.selectById(id);
- if(comActMicroWishDO==null){
+ if (comActMicroWishDO == null) {
return R.fail("id有误!");
}
comActMicroWishDAO.deleteById(id);
- comActMicroWishUserDAO.delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId,id));
+ comActMicroWishUserDAO
+ .delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId, id));
return R.ok();
}
@Override
public R timedTaskActMicroWishAll() {
- int num=comActMicroWishDAO.updateStatusAutoConfirm();
- log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
+ int num = comActMicroWishDAO.updateStatusAutoConfirm();
+ 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()){
+ 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()));
+ .eq(ComActMicroWishUserDO::getMicroWishId, microListVO.getId()));
microListVO.setStarNum(count);
});
}
--
Gitblit v1.7.1