From cd62fceb02666cd4380776de5109c3eab14dbb90 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 15 Mar 2024 10:39:16 +0800
Subject: [PATCH] 场所采集添加从业人员
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 32 ++++++++++++++++++++++++++++----
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 14 +++++++++-----
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 6 ++++++
3 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceController.java b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
index aa99608..dfa56e7 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -72,7 +72,7 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页LIST", notes = "传入place")
public R<IPage<PlaceVO>> list(PlaceEntity place, Query query) {
IPage<PlaceEntity> pages = placeService.page(Condition.getPage(query), Condition.getQueryWrapper(place));
return R.data(PlaceWrapper.build().pageVO(pages));
@@ -83,7 +83,7 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页page", notes = "传入place")
public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
return R.data(pages);
@@ -94,7 +94,7 @@
*/
@GetMapping("/ninePage")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "九小场所档案", notes = "传入place")
public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
return R.data(pages);
@@ -105,7 +105,7 @@
*/
@GetMapping("/mallPage")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "企业商超列表查询", notes = "传入place")
public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
return R.data(pages);
@@ -122,11 +122,12 @@
}
/**
- * 自定义新增/修改
+ * 自定义新增
* @param placeVO
* @return
*/
@PostMapping("/add")
+ @ApiOperation(value = "自定义新增", notes = "传入place")
public R add(@RequestBody PlaceVO placeVO){
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -138,6 +139,7 @@
* @return
*/
@PostMapping("/addOrUpdate")
+ @ApiOperation(value = "自定义新增/修改", notes = "传入place")
public R addOrUpdate(@RequestBody PlaceVO placeVO){
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -159,6 +161,7 @@
* @return
*/
@PostMapping("/updatePlace")
+ @ApiOperation(value = "自定义修改", notes = "传入place")
public R updatePlace(@RequestBody PlaceVO placeVO){
return R.status(placeService.updatePlace(placeVO));
}
@@ -222,6 +225,7 @@
* @return
*/
@GetMapping("/getDetail")
+ @ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
public R<PlaceVO> getDetail(PlaceVO place) {
return R.data(placeService.getDetail(place));
}
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 23e49e2..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
@@ -212,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());
+ }
}
/**
@@ -715,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);
@@ -732,7 +754,9 @@
// 新增场所详情
placeExtService.save(placeExtEntity);
} else {
- placeExtService.updateById(placeVO.getPlaceExtEntity());
+ if (placeVO.getPlaceExtEntity() != null) {
+ placeExtService.updateById(placeVO.getPlaceExtEntity());
+ }
}
}
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index 55d83e2..edd5fa0 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -26,6 +26,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
+import org.springblade.modules.place.entity.PlacePractitionerEntity;
import java.util.ArrayList;
import java.util.HashMap;
@@ -163,4 +164,9 @@
*/
private List<Map<String,Object>> houseBindList = new ArrayList<>();
+ /**
+ * 从业人员
+ */
+ private List<PlacePractitionerEntity> placePractitioner = new ArrayList<>();
+
}
--
Gitblit v1.9.3