From e4cdfe7a09e6bf431965359e319e671f1f17b24e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 03 六月 2024 11:18:40 +0800
Subject: [PATCH] 花城 议事投票评论删除 评论数不正确2
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 da1f6b3..b0c1a5b 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
@@ -129,6 +129,7 @@
}
return R.ok(iPage);
}
+
@Override
public R pageMicroWishAppletsDesensitize(ComActMicroWishVO comActMicroWishVO) {
Long userId = comActMicroWishVO.getResponsibleId();
@@ -266,7 +267,7 @@
*/
@Override
@Transactional
- public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
+ public synchronized R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
Long id = comActMicroWishVO.getId();
int type = comActMicroWishVO.getType().intValue();
String rejectReason = comActMicroWishVO.getRejectReason();
@@ -285,6 +286,7 @@
if(microWishDO == null){
return R.fail("未查询到该微心愿记录");
}
+
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
@@ -314,6 +316,15 @@
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 3:
+ /**
+ * 状态
+ * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成
+ */
+ if(comActMicroWishDO.getStatus()!=null && comActMicroWishDO.getStatus()!=2)
+ {
+ return R.fail("该微心愿已认领，不可重复认领");
+ }
+
isUpdate = true;
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
@@ -324,10 +335,18 @@
}
//添加操作记录
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp);
- if(comActMicroWishDO.getForm()==3)
+ if(comActMicroWishDO.getForm()!=null)
{
- comActMicroWishOperationRecordDO.setContent("认领心愿");
- comActMicroWishOperationRecordDO.setRemark("认领心愿");
+ if(comActMicroWishDO.getForm()==3)
+ {
+ comActMicroWishOperationRecordDO.setContent("认领心愿");
+ comActMicroWishOperationRecordDO.setRemark("认领心愿");
+ }
+ else
+ {
+ comActMicroWishOperationRecordDO.setContent("分配心愿");
+ comActMicroWishOperationRecordDO.setRemark("分配心愿");
+ }
}
else
{
@@ -389,7 +408,7 @@
//添加操作记录
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk);
comActMicroWishOperationRecordDO.setContent(feedback);
- if(microWishDO.getForm()==3)
+ if(comActMicroWishVO.getForm()==null || comActMicroWishVO.getForm() ==3 )
{
comActMicroWishOperationRecordDO.setRemark("用户反馈");
}
--
Gitblit v1.7.1