From 86d67bf56643c8cdf79cd247f7e8027c4f63c45f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 15 Mar 2024 11:24:53 +0800
Subject: [PATCH] 从业人员统计优化

---
 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 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 46dbe95..13cae12 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
@@ -108,9 +108,6 @@
 	private IGridRangeService gridRangeService;
 
 	@Autowired
-	private IGridmanService gridmanService;
-
-	@Autowired
 	private GridMapper gridMapper;
 
 	@Autowired
@@ -215,8 +212,27 @@
 		gridBind(placeVO);
 		// 警务网格绑定
 		jwGridCodeBind(placeVO);
+		// 保存从业人员
+		savePlacePractitioner(placeVO);
 		// 返回结果
 		return flag;
+	}
+
+
+	/**
+	 * 保存从业人员
+	 *
+	 * @param placeVO
+	 */
+	private void savePlacePractitioner(PlaceVO placeVO) {
+		if (placeVO.getPlacePractitioner() != null) {
+			IPlacePractitionerService practitionerService = SpringUtil.getBean(IPlacePractitionerService.class);
+			List<PlacePractitionerEntity> placePractitioner = placeVO.getPlacePractitioner();
+			for (PlacePractitionerEntity placePractitionerEntity : placePractitioner) {
+				placePractitionerEntity.setPlaceId(placeVO.getId());
+			}
+			practitionerService.saveOrUpdateBatch(placeVO.getPlacePractitioner());
+		}
 	}
 
 	/**
@@ -718,13 +734,16 @@
 	@Transactional(rollbackFor = Exception.class)
 	public void savePlaceExtAndTaskInfo(PlaceVO placeVO) {
 		PlaceExtEntity placeExtEntity = new PlaceExtEntity();
-		placeExtEntity.setPlaceId(placeVO.getId());
 		// 判断是否已存在,已存在则不新增
 		QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq("is_deleted", 0)
 			.eq("place_id", placeVO.getId());
-		PlaceExtEntity one = placeExtService.getOne(wrapper);
-		if (null == one) {
+		PlaceExtEntity extServiceOne = placeExtService.getOne(wrapper);
+		if (null == extServiceOne) {
+			// 判断是否有传
+			if (placeVO.getPlaceExtEntity() != null) {
+				placeExtEntity = placeVO.getPlaceExtEntity();
+			}
 			placeExtEntity.setPlaceId(placeVO.getId());
 			// 默认给待完善状态
 			placeExtEntity.setConfirmFlag(4);
@@ -735,7 +754,9 @@
 			// 新增场所详情
 			placeExtService.save(placeExtEntity);
 		} else {
-			placeExtService.updateById(placeVO.getPlaceExtEntity());
+			if (placeVO.getPlaceExtEntity() != null) {
+				placeExtService.updateById(placeVO.getPlaceExtEntity());
+			}
 		}
 	}
 
@@ -1507,4 +1528,20 @@
 		}
 		return null;
 	}
+
+	/**
+	 * 企业商超列表查询
+	 */
+	@Override
+	public IPage<PlaceVO> selectMallPage(IPage<PlaceVO> page, PlaceVO place) {
+		// 公共参数设置
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
+		List<PlaceVO> placeVOS = baseMapper.selectMallPage(page,
+			place,
+			commonParamSet.getGridCodeList(),
+			commonParamSet.getRegionChildCodesList(),
+			commonParamSet.getIsAdministrator());
+		// 返回
+		return page.setRecords(placeVOS);
+	}
 }

--
Gitblit v1.9.3