From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 2279d91..06f3636 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
@@ -16,10 +16,13 @@
*/
package org.springblade.modules.place.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
+import org.springblade.modules.place.entity.PlacePractitionerEntity;
+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.mapper.PlaceExtMapper;
@@ -33,6 +36,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
/**
* 场所详情表 服务实现类
@@ -48,6 +52,9 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IPlacePractitionerService placePractitionerService;
/**
* 自定义查询
@@ -85,12 +92,14 @@
boolean flag = false;
// 设置更新时间
placeExt.setConfirmTime(new Date());
+ placeExt.setConfirmUserId(AuthUtil.getUserId());
// 更新数据
boolean b = updateById(placeExt);
if (b) {
+ PlaceExtEntity entity = getById(placeExt.getId());
// 更新任务表状态
TaskEntity taskEntity = new TaskEntity();
- taskEntity.setId(placeExt.getTaskId());
+ taskEntity.setId(entity.getTaskId());
taskEntity.setStatus(placeExt.getConfirmFlag());
flag = taskService.updateById(taskEntity);
}
@@ -126,4 +135,22 @@
}
return false;
}
+
+ /**
+ * 场所详情表 自定义详情
+ * @param placeExt
+ * @return
+ */
+ @Override
+ public PlaceExtVO getDetail(PlaceExtVO placeExt) {
+ PlaceExtVO detail = baseMapper.getDetail(placeExt);
+ if (null!=detail) {
+ // 查询从业人员信息
+ QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("place_id", placeExt.getPlaceId());
+ detail.setPlacePractitioner(placePractitionerService.list(queryWrapper));
+ }
+ // 返回
+ return detail;
+ }
}
--
Gitblit v1.9.3