From edbbe803b5c270a1acffbc7946bdda0d5e420dc5 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期三, 07 七月 2021 10:27:29 +0800 Subject: [PATCH] 修改bug --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 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 1ee21e8..fb6c16f 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 @@ -40,6 +40,8 @@ private EventMapper eventMapper; @Resource private EventGridMemberRelationService eventGridMemberRelationService; + @Resource + private LcCompareCodeMapper lcCompareCodeMapper; /** * 新增区县/街道/社区/网格员网格数据管理 * @param eventGridDataAddDTO @@ -201,6 +203,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(); } } @@ -259,4 +270,18 @@ return R.ok(eventGridDataAreaVOList); } + @Override + public R deleteGridDataByAdmin(List<Long> Ids){ + Integer count = eventMapper.getEventCountByGridIds(Ids); + if(count > 0){ + return R.fail("您选择的网格已发布过事件,不可删除"); + } + if(this.baseMapper.deleteBatchIds(Ids) > 0){ + return R.ok(); + }else{ + return R.fail(); + } + + } + } -- Gitblit v1.7.1