From ae33fef700e5d2558dffb03c8f66358da2545791 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 07 一月 2021 16:25:41 +0800
Subject: [PATCH] 通知后台加入代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 2df1137..642a258 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
@@ -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.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
@@ -103,10 +104,7 @@
@Override
public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
Long id = comActMicroWishVO.getId();
- Integer type = comActMicroWishVO.getType();
- if (ObjectUtils.isEmpty(type)||type>5||type<1) {
- return R.fail("操作类型不对");
- }
+ int type = comActMicroWishVO.getType().intValue();
String rejectReason = comActMicroWishVO.getRejectReason();
Long responsibleId = comActMicroWishVO.getResponsibleId();
String feedback = comActMicroWishVO.getFeedback();
@@ -132,10 +130,9 @@
break;
case 4:
comActMicroWishDO.setDistributionAt(new Date());
- comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);//进行中
+ comActMicroWishDO.setResponsibleId(null);
+ comActMicroWishDO.setStatus(5);//待确认
comActMicroWishDO.setForm(2);
-// todo 给负责人增加一个待办事件
break;
case 5:
comActMicroWishDO.setFeedbackAt(new Date());
@@ -218,7 +215,18 @@
return R.fail();
}
-
+ /**
+ * 社区首页代办事件集合
+ *
+ * @param communityId 社区id
+ * @param userId 登录用户
+ * @return 代办事件集合
+ */
+ @Override
+ public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
+ List<TodoEventsVO> todoEventsVOS=comActMicroWishDAO.selectNeedToDo(communityId,userId);
+ return todoEventsVOS;
+ }
}
--
Gitblit v1.7.1