From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 e38134c..4d8c1d2 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
@@ -33,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;
@@ -129,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();
// 申明新增，修改，删除集合
@@ -140,12 +141,6 @@
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
practitionerEntity.setPlaceId(placeExt.getPlaceId());
- if (StringUtils.isNotBlank(practitionerEntity.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = practitionerEntity.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- practitionerEntity.setBirthday(DateUtil.parse(birthDateStr, "yyyyMMdd"));
- }
if (null == practitionerEntity.getId()) {
// 新增
practitionerEntity.setPlaceId(placeExt.getPlaceId());
@@ -198,6 +193,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);
+ }
}
/**
--
Gitblit v1.9.3