From d65293482a2f06c23b8d1d5cd1d440d1302d915d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 16 Mar 2024 18:03:20 +0800
Subject: [PATCH] 从业人员查询统计修改，去除多余字段
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 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 9211288..91c24b1 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);
@@ -734,6 +753,10 @@
placeExtEntity.setUpdateUser(AuthUtil.getUserId());
// 新增场所详情
placeExtService.save(placeExtEntity);
+ } else {
+ if (placeVO.getPlaceExtEntity() != null) {
+ placeExtService.updateById(placeVO.getPlaceExtEntity());
+ }
}
}
@@ -852,6 +875,11 @@
QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
+ // 查询从业人员
+ IPlacePractitionerService placePractitionerService = SpringUtils.getBean(IPlacePractitionerService.class);
+ List<PlacePractitionerEntity> entityList = placePractitionerService.list(Wrappers.<PlacePractitionerEntity>lambdaQuery()
+ .eq(PlacePractitionerEntity::getPlaceId, placeVO.getId()));
+ placeVO.setPlacePractitioner(entityList);
// 查询绑定的房屋
placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
}
@@ -988,9 +1016,9 @@
placeRelEntity.setPlaceId(placeEntity.getId());
placeRelEntity.setStreetName(placeExcel.getStreetName());
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",placeExcel.getCommunityName());
+ wrapper.eq("name", placeExcel.getCommunityName());
Region region = SpringUtils.getBean(IRegionService.class).getOne(wrapper);
- if (null!=region){
+ if (null != region) {
placeRelEntity.setCommunityCode(region.getCode());
}
placeRelEntity.setCommunityName(placeExcel.getCommunityName());
@@ -1034,10 +1062,10 @@
if (!Strings.isBlank(placeExcel.getLabelCode())) {
// 匹配标签
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("level",3).eq("category_name",placeExcel.getLabelCode()).eq("is_deleted",0);
+ wrapper.eq("level", 3).eq("category_name", placeExcel.getLabelCode()).eq("is_deleted", 0);
// 查询
List<CategoryEntity> list = SpringUtils.getBean(ICategoryService.class).list(wrapper);
- if (list.size()>0){
+ if (list.size() > 0) {
PlaceVO placeVO = new PlaceVO();
CategoryEntity categoryEntity = list.get(0);
placeVO.setLabel(categoryEntity.getCategoryNo());
@@ -1505,4 +1533,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