From a2979b5df06744de80c6be6218260e2fa701cce2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 10 Jan 2024 20:27:42 +0800
Subject: [PATCH] 新增标签任务处理
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 5aa382b..937b49a 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -108,10 +108,6 @@
if (place.getRoleName().equals("网格员")){
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- place.setCreateUser(AuthUtil.getUserId());
- }
- if (!place.getRoleName().equals("系统管理员")){
- place.setCreateUser(AuthUtil.getUserId());
}
}
List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
@@ -121,8 +117,6 @@
GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
if (null!= gridVO){
placeVO.setGridName(gridVO.getGridName());
-// placeVO.setNeiName(gridVO.getCommunityName());
-// placeVO.setTownStreetName(gridVO.getTownStreetName());
}
}
// 返回
@@ -454,13 +448,8 @@
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeVO.getId());
- if (!Strings.isBlank(placeVO.getPrincipalPhone())) {
- // 待审核
- placeExtEntity.setConfirmFlag(1);
- }else {
- // 待完善
- placeExtEntity.setConfirmFlag(4);
- }
+ // 默认给待完善状态
+ placeExtEntity.setConfirmFlag(4);
placeExtEntity.setCreateTime(new Date());
placeExtEntity.setUpdateTime(new Date());
placeExtEntity.setCreateUser(AuthUtil.getUserId());
@@ -553,6 +542,10 @@
placeVO.setGrid(gridVO);
place.setGridId(gridVO.getId());
}
+ // 设置详情信息
+ QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("place_id",placeVO.getId());
+ placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
} else {
// 通过定位点落面分析网格位置，反向推出社区派出所相关数据
@@ -852,4 +845,15 @@
}
return null;
}
+
+ /**
+ * 根据标签编号集合查询对应的场所
+ * @param stringList
+ * @param color
+ * @return
+ */
+ @Override
+ public List<PlaceVO> getPlaceListByParam(List<String> stringList,String color) {
+ return baseMapper.getPlaceListByParam(stringList,color);
+ }
}
--
Gitblit v1.9.3