From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 3d90109..ffdeb5b 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -19,9 +19,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
@@ -31,6 +33,7 @@
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
+import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -101,8 +104,8 @@
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,commonParamSet.getRegionChildCodesList(),
- commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList()));
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
/**
@@ -127,7 +130,7 @@
updatePlaceInfo(placeExt);
// 查询对应已存在的从业人员
QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("place_id", placeExt.getPlaceId());
+ wrapper.eq("place_id", placeExt.getPlaceId()).eq("is_deleted", 0);
List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
// 申明新增，修改，删除集合
@@ -137,16 +140,14 @@
List<PlacePractitionerEntity> removeList = new ArrayList<>();
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
+ if (practitionerEntity.getResignationTime() != null) {
+ practitionerEntity.setResignationFlag(2);
+ }
practitionerEntity.setPlaceId(placeExt.getPlaceId());
if (null == practitionerEntity.getId()) {
// 新增
- PlacePractitionerEntity placePractitionerEntity = new PlacePractitionerEntity();
-
- placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
- placePractitionerEntity.setName(practitionerEntity.getName());
- placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
- placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
- addList.add(placePractitionerEntity);
+ practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ addList.add(practitionerEntity);
} else {
newList.add(practitionerEntity);
}
@@ -195,6 +196,17 @@
}
// 更新
placeService.updateById(placeEntity);
+ // 警格网格绑定修改
+ if (!Strings.isBlank(placeEntity.getHouseCode()) && !Strings.isBlank(placeEntity.getLng())) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setHouseCode(placeEntity.getHouseCode());
+ placeVO.setLng(placeEntity.getLng());
+ placeVO.setLat(placeEntity.getLat());
+ // 网格绑定
+ placeService.policePositionHandle(placeVO);
+ // 警务网格绑定
+ placeService.jwGridCodeBind(placeVO);
+ }
}
/**
@@ -267,6 +279,7 @@
// 查询从业人员信息
QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("place_id", placeExt.getPlaceId());
+ queryWrapper.eq("resignation_flag",1);
detail.setPlacePractitioner(placePractitionerService.list(queryWrapper));
}
// 返回
@@ -279,6 +292,6 @@
placeExt.setConfirmFlag(confirmFlag);
placeExt.setNeiCode(neiCode);
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return baseMapper.selectCount(placeExt,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
+ return baseMapper.selectCount(placeExt, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
}
}
--
Gitblit v1.9.3