From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 0780873..9502966 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;
@@ -40,6 +41,8 @@
private EventMapper eventMapper;
@Resource
private EventGridMemberRelationService eventGridMemberRelationService;
+ @Resource
+ private LcCompareCodeMapper lcCompareCodeMapper;
/**
* 新增区县/街道/社区/网格员网格数据管理
* @param eventGridDataAddDTO
@@ -201,6 +204,15 @@
}
}
+ if(eventGridDataDTO.getLcGridId() != null){
+ //关联市平台网格
+ LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
+ if(compareCodeDO != null){
+ compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
+ compareCodeDO.setGridName(gridDataDO.getGridName());
+ lcCompareCodeMapper.updateById(compareCodeDO);
+ }
+ }
return R.ok();
}
}
@@ -241,6 +253,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