From 9c8735c70d86a31081340ca78bb2b538ed11a6e5 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 18:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
index fb6c16f..72f9e52 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -230,6 +231,7 @@
EventGridDataDO gridDataDO = this.baseMapper.selectById(eventGridDataDTO.getGridId());
if(gridDataDO != null){
BeanUtils.copyProperties(eventGridDataDTO,gridDataDO);
+ gridDataDO.setRemarks(eventGridDataDTO.getRemarks());
gridDataDO.setUpdateBy(eventGridDataDTO.getUserId());
if(this.baseMapper.updateById(gridDataDO) > 0){
//移除网格员和网格关系
@@ -252,6 +254,25 @@
eventGridMemberRelationService.saveBatch(memberRelationDOList);
}
}
+
+ if(eventGridDataDTO.getLcGridId() != null){
+
+ //查询已存在的关系需要清除
+ LcCompareCodeDO oldCompareCodeDO = lcCompareCodeMapper.selectOne(new QueryWrapper<LcCompareCodeDO>()
+ .lambda().eq(LcCompareCodeDO::getLocalGridId,gridDataDO.getId()));
+ if(oldCompareCodeDO != null){
+ lcCompareCodeMapper.updateLcCompareCode(gridDataDO.getId());
+ }
+
+ //关联市平台网格
+ LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
+ if(compareCodeDO != null){
+ compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
+ compareCodeDO.setGridName(gridDataDO.getGridName());
+ lcCompareCodeMapper.updateById(compareCodeDO);
+ }
+ }
+
return R.ok();
}
}
--
Gitblit v1.7.1