From af21084fa4d1e5f8432f61fbd26a3e4e99495616 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 Jan 2024 18:03:49 +0800
Subject: [PATCH] 三色任务完善
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 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 03700c7..55000e5 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
@@ -33,6 +33,7 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
@@ -108,10 +109,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 +118,6 @@
GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
if (null!= gridVO){
placeVO.setGridName(gridVO.getGridName());
-// placeVO.setNeiName(gridVO.getCommunityName());
-// placeVO.setTownStreetName(gridVO.getTownStreetName());
}
}
// 返回
@@ -454,13 +449,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 +543,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 {
// 通过定位点落面分析网格位置，反向推出社区派出所相关数据
@@ -830,4 +824,79 @@
}
return null;
}
+
+ /**
+ * 商超数据处理
+ * @return
+ */
+ @Override
+ public Object placeAndRelHandle() {
+ // 查询未处理的商超数据
+ List<PlaceEntity> placeEntityList = baseMapper.placeAndRelHandle();
+ // 处理
+ for (PlaceEntity placeEntity : placeEntityList) {
+ if (Strings.isBlank(placeEntity.getHouseCode())){
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ // 商超数据
+ placeEntity.setSource(3);
+ // 更新
+ updateById(placeEntity);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）
+ * @param stringList
+ * @param tableName
+ * @return
+ */
+ @Override
+ public List<PlaceVO> getPlaceListByParam(List<String> stringList,String tableName) {
+ return baseMapper.getPlaceListByParam(stringList,tableName);
+ }
+
+ /**
+ * 删除
+ * @param longs
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean removePlace(List<Long> longs) {
+ // 删除
+ boolean removeByIds = removeByIds(longs);
+ // 删除对应的详情
+ removePlaceExt(longs);
+ // 删除对应的标签绑定信息
+ removePlaceLabel(longs);
+ // 返回
+ return removeByIds;
+ }
+
+ /**
+ * 删除场所对应的详情
+ * @param longs
+ */
+ public void removePlaceExt(List<Long> longs) {
+ for (Long id : longs) {
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",id);
+ placeExtService.remove(wrapper);
+ }
+ }
+
+ /**
+ * 删除对应的标签绑定信息
+ * @param longs
+ */
+ public void removePlaceLabel(List<Long> longs) {
+ for (Long id : longs) {
+ QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",id);
+ placePoiLabelService.remove(wrapper);
+ }
+ }
}
--
Gitblit v1.9.3