From a407311a305b6428e5d16a72f67205d89f5b5d4b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 16 十一月 2023 16:17:55 +0800
Subject: [PATCH] 修改微心愿列表我认领的接口6
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 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 ba99382..da1f6b3 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
@@ -318,14 +318,22 @@
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
comActMicroWishDO.setStatus(3);//进行中
- comActMicroWishDO.setForm(1);
+// comActMicroWishDO.setForm(1);
if(comActMicroWishVO.getHandleIds() != null && comActMicroWishVO.getHandleIds().size() > 0){
comActMicroWishDO.setHandleId(Joiner.on(",").join(comActMicroWishVO.getHandleIds()));
}
//添加操作记录
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp);
- comActMicroWishOperationRecordDO.setContent("分配心愿");
- comActMicroWishOperationRecordDO.setRemark("分配心愿");
+ if(comActMicroWishDO.getForm()==3)
+ {
+ comActMicroWishOperationRecordDO.setContent("认领心愿");
+ comActMicroWishOperationRecordDO.setRemark("认领心愿");
+ }
+ else
+ {
+ comActMicroWishOperationRecordDO.setContent("分配心愿");
+ comActMicroWishOperationRecordDO.setRemark("分配心愿");
+ }
comActMicroWishOperationRecordDO.setUserId(responsibleId);
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
@@ -381,7 +389,14 @@
//添加操作记录
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk);
comActMicroWishOperationRecordDO.setContent(feedback);
- comActMicroWishOperationRecordDO.setRemark("社区反馈");
+ if(microWishDO.getForm()==3)
+ {
+ comActMicroWishOperationRecordDO.setRemark("用户反馈");
+ }
+ else
+ {
+ comActMicroWishOperationRecordDO.setRemark("社区反馈");
+ }
comActMicroWishOperationRecordDO.setImgUrl(feedbackPhotoPathList);
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
}
--
Gitblit v1.7.1