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/ComActMicroWishServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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..172aabc 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
@@ -111,33 +111,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.setDistributionAt(date);
+                comActMicroWishDO.setResponsibleId(responsibleId);
                 comActMicroWishDO.setStatus(5);//待确认
                 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 +208,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