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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 4d8c1d2..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
@@ -130,7 +130,7 @@
 		updatePlaceInfo(placeExt);
 		// 查询对应已存在的从业人员
 		QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
-		wrapper.eq("place_id", placeExt.getPlaceId()).eq("is_deleted",0);
+		wrapper.eq("place_id", placeExt.getPlaceId()).eq("is_deleted", 0);
 		List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
 		List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
 		// 申明新增,修改,删除集合
@@ -140,6 +140,9 @@
 		List<PlacePractitionerEntity> removeList = new ArrayList<>();
 		// 找出需要新增的,否则组成新集合进行比对
 		for (PlacePractitionerEntity practitionerEntity : list) {
+			if (practitionerEntity.getResignationTime() != null) {
+				practitionerEntity.setResignationFlag(2);
+			}
 			practitionerEntity.setPlaceId(placeExt.getPlaceId());
 			if (null == practitionerEntity.getId()) {
 				// 新增
@@ -194,7 +197,7 @@
 		// 更新
 		placeService.updateById(placeEntity);
 		// 警格网格绑定修改
-		if (!Strings.isBlank(placeEntity.getHouseCode()) && !Strings.isBlank(placeEntity.getLng())){
+		if (!Strings.isBlank(placeEntity.getHouseCode()) && !Strings.isBlank(placeEntity.getLng())) {
 			PlaceVO placeVO = new PlaceVO();
 			placeVO.setHouseCode(placeEntity.getHouseCode());
 			placeVO.setLng(placeEntity.getLng());
@@ -276,6 +279,7 @@
 			// 查询从业人员信息
 			QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("place_id", placeExt.getPlaceId());
+			queryWrapper.eq("resignation_flag",1);
 			detail.setPlacePractitioner(placePractitionerService.list(queryWrapper));
 		}
 		// 返回

--
Gitblit v1.9.3