From 2f81f01a93e4384b2c17378aeb991938fc356cb4 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 16:22:08 +0800
Subject: [PATCH] bug-416-【后端-宣传教育 】后端新增的宣传教育发布成功，在app上分配的网格员昵称和头像不正确，在后端修改了网格员的头像和昵称也未同步
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index c078b84..44903db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
@@ -31,15 +29,22 @@
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
+ @Resource
+ private UserService userService;
+
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
- public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
+ public R add(EventGridMemberAddDTO eventGridMemberAddDTO){
+
+ userService.addGridUser(eventGridMemberAddDTO);
+
+
+
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
- eventGridMemberRelationDO.setCreateAt(new Date());
+ eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
return R.ok();
}
@@ -48,12 +53,12 @@
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
- public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
+ public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
+ BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
//eventGridMemberRelationDO.setUpdateAt(new Date());
if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
return R.ok();
--
Gitblit v1.7.1