From a0f6c9c91b61503a97a17fe2ecc2775afb75fda1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:42:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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 2824001..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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -120,18 +121,21 @@
}
}
//查询反馈列表
- if(comActMicroWishVO.getStatus()==5||comActMicroWishVO.getStatus()==6){
- List<ComActMicroWishFeedbackVO> list=comActMicroWishFeedbackMapper.selectByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setFeedbackVOList(list);
- }
+ List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
+ if(!feedList.isEmpty()){
+ comActMicroWishVO.setFeedbackVOList(feedList);
}
//查询操作记录
- List<ComActMicroWishOperationRecordVO> list=comActMicroWishOperationRecordMapper.getByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setOperationRecordVOList(list);
+ List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
+ if(!operationList.isEmpty()){
+ comActMicroWishVO.setOperationRecordVOList(operationList);
}
comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
+ //查询同类型id数组
+ List<Long> idList=comActMicroWishOperationRecordMapper.selectId(comActMicroWishVO);
+ if(!idList.isEmpty()){
+ comActMicroWishVO.setIdList(idList);
+ }
return R.ok(comActMicroWishVO);
}
@@ -152,14 +156,23 @@
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);
comActMicroWishOperationRecordDO.setUserId(comActMicroWishVO.getUserId());
comActMicroWishOperationRecordDO.setWishId(comActMicroWishVO.getId());
+ ComActMicroWishDO microWishDO = this.baseMapper.selectById(id);
+ if(microWishDO == null){
+ return R.fail("未查询到该微心愿记录");
+ }
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
+ isUpdate = true;
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setAimNum(comActMicroWishVO.getAimNum());
comActMicroWishDO.setStatus(7);//集心中
@@ -168,20 +181,26 @@
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 2:
+ isUpdate = true;
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
comActMicroWishDO.setStatus(4);//驳回
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.bh);
- comActMicroWishOperationRecordDO.setContent("审核未通过");
+ comActMicroWishOperationRecordDO.setContent(rejectReason);
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);//待确认
@@ -193,19 +212,31 @@
}
//新增反馈记录
ComActMicroWishFeedbackDO comActMicroWishFeedbackDO=new ComActMicroWishFeedbackDO();
- comActMicroWishFeedbackDO.setCreatTime(date);
+ comActMicroWishFeedbackDO.setCreateTime(date);
comActMicroWishFeedbackDO.setContent(feedback);
comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList);
comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId());
comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId());
- comActMicroWishDO.setStatus(5);
+ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
+ isUpdate = true;
+ comActMicroWishDO.setStatus(ComActMicroWishDO.status.ywc);
+ comActMicroWishDO.setFinishAt(date);
+ comActMicroWishDO.setFinish(feedback);
+ comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
+ }
+// else {
+// comActMicroWishDO.setStatus(3);
+// }
comActMicroWishFeedbackMapper.insert(comActMicroWishFeedbackDO);
- break;
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();
@@ -241,6 +272,7 @@
if (num>0) {
if(count>=comActMicroWishDO.getAimNum()-1){
comActMicroWishDO.setStatus(ComActMicroWishDO.status.dfp);
+ comActMicroWishDO.setFeedbackAt(DateUtil.date());
comActMicroWishDAO.updateById(comActMicroWishDO);
}
return R.ok();
@@ -263,8 +295,8 @@
return R.fail("心愿不存在");
}
Integer status = comActMicroWishDO1.getStatus();
- if (status.intValue()!=5) {
- return R.fail("心愿状态不是待确认");
+ if (!status.equals(ComActMicroWishDO.status.ywc)) {
+ return R.fail("心愿状态不是已完成状态");
}
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(comActMicroWishVO.getId());
--
Gitblit v1.7.1