From 6873ee2b98283d9a876dfc6e5d878094e5de61d9 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 11:30:46 +0800
Subject: [PATCH] 系统配置

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 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 e16e484..a8fe9d1 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
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.TodoEventsVO;
 import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
 import com.panzhihua.service_community.dao.ComActEasyPhotoUserDAO;
 import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
@@ -42,6 +43,7 @@
         Page page = new Page<>();
         Long pageNum = comActEasyPhotoVO.getPageNum();
         Long pageSize = comActEasyPhotoVO.getPageSize();
+        Long userId = comActEasyPhotoVO.getLogInUserId();
         if (null==pageNum||0==pageNum) {
             pageNum = 1l;
         }
@@ -55,8 +57,7 @@
         if (!ObjectUtils.isEmpty(records)) {
             records.forEach(comActEasyPhotoVO1 -> {
                 Long id = comActEasyPhotoVO1.getId();
-                Long sponsorId = comActEasyPhotoVO1.getSponsorId();
-                ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, sponsorId));
+                ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
                 if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
                     comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
                 }else {
@@ -78,7 +79,7 @@
     @Override
     public R detailEasyPhoto(Long id, Long userId) {
         ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
-        if (ObjectUtils.isEmpty(comActEasyPhotoVO)) {
+        if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null==comActEasyPhotoVO.getStatus()) {
             return R.fail("随手拍不存在");
         }
         ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
@@ -155,25 +156,29 @@
 //        操作类型 1审核通过 2驳回  3反馈
         ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
         cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
-        int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue();
+        cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
+        Date date = new Date();
         switch (type){
             case 1:
+                int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue();
                 if (isNeedFeedBack==1) {
                     cmActEasyPhotoDO.setStatus(2);//进行中
+                    cmActEasyPhotoDO.setIsNeedFeedBack(1);
                 }else{
                     cmActEasyPhotoDO.setStatus(4);//已完成
                 }
-                cmActEasyPhotoDO.setExamineAt(new Date());
+                cmActEasyPhotoDO.setExamineAt(date);
                 break;
             case 2:
                 cmActEasyPhotoDO.setStatus(3);//已驳回
-                cmActEasyPhotoDO.setExamineAt(new Date());
+                cmActEasyPhotoDO.setExamineAt(date);
+                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
                 break;
             case 3:
                 cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
                 cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
                 cmActEasyPhotoDO.setStatus(4);//已完成
-                cmActEasyPhotoDO.setFeedbackAt(new Date());
+                cmActEasyPhotoDO.setFeedbackAt(date);
                 break;
             default:break;
         }
@@ -183,4 +188,17 @@
         }
         return R.fail();
     }
+
+    /**
+     * 随手拍是否有待审核和带反馈的事件
+     *
+     * @param communityId 社区id
+     * @param userId      登录用户id
+     * @return 待处理事件集合
+     */
+    @Override
+    public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
+        List<TodoEventsVO> todoEventsVOS=comActEasyPhotoDAO.selectNeedToDo(communityId,userId);
+        return todoEventsVOS;
+    }
 }

--
Gitblit v1.7.1