From 7c45f37ddc2ddf668cf74f9e7014dadb06d05ed5 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期四, 25 四月 2024 14:32:21 +0800
Subject: [PATCH] 大屏 左边数据 bug修改 2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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..8470194 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,30 @@
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()!=null)
+ {
+ if(comActMicroWishDO.getForm()==3)
+ {
+ comActMicroWishOperationRecordDO.setContent("认领心愿");
+ comActMicroWishOperationRecordDO.setRemark("认领心愿");
+ }
+ else
+ {
+ comActMicroWishOperationRecordDO.setContent("分配心愿");
+ comActMicroWishOperationRecordDO.setRemark("分配心愿");
+ }
+ }
+ else
+ {
+ comActMicroWishOperationRecordDO.setContent("分配心愿");
+ comActMicroWishOperationRecordDO.setRemark("分配心愿");
+ }
comActMicroWishOperationRecordDO.setUserId(responsibleId);
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
@@ -381,7 +397,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