From ca93fe7eb03bec91d5cb9f45ebb3b6c98819b7ff Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 18:01:09 +0800
Subject: [PATCH] 我的任务，里面审核搜索加上时间条件
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 5730afa..b77f501 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
@@ -29,6 +29,7 @@
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
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.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
@@ -76,6 +77,9 @@
@Autowired
private IGridRangeService gridRangeService;
+
+ @Autowired
+ private IGridmanService gridmanService;
/**
* 自定义列表查询
@@ -185,7 +189,7 @@
if (null!=placeVO.getGridId()){
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
+ wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null==one){
// 新增
@@ -195,6 +199,23 @@
// 插入
gridRangeService.save(gridRangeEntity);
}
+ }else {
+ // 判断网格员，查询对应网格人对应的网格id
+ Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
+ if (null!=gridId){
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id",gridId).eq("house_code",placeVO.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null==one){
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(placeVO.getHouseCode());
+ gridRangeEntity.setGridId(gridId);
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }
+ }
}
}
--
Gitblit v1.9.3