From 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 04 九月 2021 16:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 6a8d37f..866e4cb 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
@@ -156,6 +156,7 @@
String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(id);
+ Boolean isUpdate = false;
Date date = new Date();
ComActMicroWishOperationRecordDO comActMicroWishOperationRecordDO=new ComActMicroWishOperationRecordDO();
comActMicroWishOperationRecordDO.setCreateTime(date);
@@ -168,6 +169,7 @@
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
+ isUpdate = true;
if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
return R.fail("该微心愿已审核，不可重复审核");
}
@@ -179,6 +181,7 @@
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 2:
+ isUpdate = true;
if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
return R.fail("该微心愿已审核，不可重复审核");
}
@@ -190,12 +193,14 @@
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 3:
+ isUpdate = true;
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
comActMicroWishDO.setStatus(3);//进行中
comActMicroWishDO.setForm(1);
break;
case 4:
+ isUpdate = true;
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
comActMicroWishDO.setStatus(3);//待确认
@@ -213,7 +218,8 @@
comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId());
comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId());
if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
- comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
+ isUpdate = true;
+ comActMicroWishDO.setStatus(ComActMicroWishDO.status.ywc);
comActMicroWishDO.setFinishAt(date);
comActMicroWishDO.setFinish(feedback);
comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
@@ -222,12 +228,15 @@
// comActMicroWishDO.setStatus(3);
// }
comActMicroWishFeedbackMapper.insert(comActMicroWishFeedbackDO);
- return R.ok();
default:
break;
}
- int update = comActMicroWishDAO.updateById(comActMicroWishDO);
- if (update>0) {
+ if(isUpdate){
+ int update = comActMicroWishDAO.updateById(comActMicroWishDO);
+ if (update>0) {
+ return R.ok();
+ }
+ }else{
return R.ok();
}
return R.fail();
--
Gitblit v1.7.1