From b500fcb5f25d0f1f0e31304fd1fa340e84360f3a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 22 五月 2021 10:56:41 +0800
Subject: [PATCH] 实有人口优化
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 fc552b0..6a49d32 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,12 +7,12 @@
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
-import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActEasyPhotoCommentDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoCommentUserDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
@@ -78,6 +78,7 @@
}else {
comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
}
+ comActEasyPhotoVO1.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO1.getPhone()));
});
iPage.setRecords(records);
}
@@ -94,7 +95,8 @@
@Override
public R detailEasyPhoto(Long id, Long userId) {
ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
- if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null==comActEasyPhotoVO.getStatus()) {
+ Integer status = comActEasyPhotoVO.getStatus();
+ if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null== status) {
return R.fail("随手拍不存在");
}
ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
@@ -103,7 +105,17 @@
} else {
comActEasyPhotoVO.setHaveGiveThumbsUp(1);
}
- List<ComActEasyPhotoCommentVO> comActEasyPhotoCommentVOList=new ArrayList<>();
+
+ if (status.intValue()==4) {
+ Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
+ if (null==feedbackAt) {
+ comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
+ }
+ }
+ comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
+ if(comActEasyPhotoVO.getAddrRemark()==null){
+ comActEasyPhotoVO.setAddrRemark("");
+ }
return R.ok(comActEasyPhotoVO);
}
@@ -245,8 +257,9 @@
Long id = comActEasyPhotoVO1.getId();
Integer status = comActEasyPhotoVO1.getStatus();
Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
- ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
- if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
+ List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
+ comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
+ if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
}else {
comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
@@ -280,6 +293,13 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActEasyPhotoCommentVO> iPage = comActEasyPhotoCommentDAO.pageComActEasyPhotoComment(page, pageComActEasyPhotoCommentDTO);
+ if(!iPage.getRecords().isEmpty()){
+ for (ComActEasyPhotoCommentVO commentVO:iPage.getRecords()) {
+ if(StringUtils.isEmpty(commentVO.getName())){
+ commentVO.setName(commentVO.getNickName());
+ }
+ }
+ }
return R.ok(iPage);
}
--
Gitblit v1.7.1