From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 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 642a258..a3e8d59 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
@@ -79,6 +79,9 @@
@Override
public R detailMicroWish(Long id, Long userId) {
ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
+ if (ObjectUtils.isEmpty(comActMicroWishVO)) {
+ return R.fail("微心愿不存在");
+ }
Integer starNum = comActMicroWishVO.getStarNum();
if (null==starNum) {
comActMicroWishVO.setStarNum(0);
@@ -111,33 +114,37 @@
String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(id);
+ Date date = new Date();
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
- comActMicroWishDO.setExamineAt(new Date());
+ comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setStatus(2);//待分配
break;
case 2:
- comActMicroWishDO.setExamineAt(new Date());
+ comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
comActMicroWishDO.setStatus(4);//驳回
break;
case 3:
- comActMicroWishDO.setDistributionAt(new Date());
+ comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
comActMicroWishDO.setStatus(3);//进行中
comActMicroWishDO.setForm(1);
break;
case 4:
- comActMicroWishDO.setDistributionAt(new Date());
- comActMicroWishDO.setResponsibleId(null);
- comActMicroWishDO.setStatus(5);//待确认
+ comActMicroWishDO.setDistributionAt(date);
+ comActMicroWishDO.setResponsibleId(responsibleId);
+ comActMicroWishDO.setStatus(3);//待确认
comActMicroWishDO.setForm(2);
break;
case 5:
- comActMicroWishDO.setFeedbackAt(new Date());
+ comActMicroWishDO.setFeedbackAt(date);
comActMicroWishDO.setStatus(5);//待确认
comActMicroWishDO.setFeedback(feedback);
+ comActMicroWishDO.setFinish(feedback);
+ comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
+ comActMicroWishDO.setFinishAt(date);
comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList);
break;
default:
@@ -204,7 +211,7 @@
}
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(comActMicroWishVO.getId());
- comActMicroWishDO.setExamineAt(comActMicroWishVO.getExamineAt());
+ comActMicroWishDO.setEvaluateAt(comActMicroWishVO.getEvaluateAt());
comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
comActMicroWishDO.setScore(comActMicroWishVO.getScore());
comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate());
--
Gitblit v1.7.1