From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 66a937a..3479ba4 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -17,9 +17,11 @@
package org.springblade.modules.place.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
+import org.springblade.modules.place.dto.PlaceCheckDTO;
import org.springblade.modules.place.entity.PlaceCheckEntity;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.mapper.PlaceCheckMapper;
@@ -43,18 +45,30 @@
@Override
public IPage<PlaceCheckVO> selectPlaceCheckPage(IPage<PlaceCheckVO> page, PlaceCheckVO placeCheck) {
- return page.setRecords(baseMapper.selectPlaceCheckPage(page, placeCheck));
+ List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page, placeCheck);
+ for (PlaceCheckVO placeCheckVO : placeCheckVOS) {
+ int number = 0;
+ for (PatrolRecord patrolRecord : placeCheckVO.getPatrolRecordVOList()) {
+ if (patrolRecord.getState().equals(0)) {
+ number++;
+ }
+ }
+ placeCheckVO.setNumber(number);
+ }
+ return page.setRecords(placeCheckVOS);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean savePlace(PlaceCheckVO placeCheck) throws Exception {
+ placeCheck.setCreateUser(AuthUtil.getUserId());
boolean save = save(placeCheck);
if (save) {
IPatrolRecordService bean = SpringUtil.getBean(IPatrolRecordService.class);
List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList();
patrolRecordVOList.stream().forEach(item -> {
item.setPlaceCheckId(placeCheck.getId());
+ item.setCreateUser(AuthUtil.getUserId());
});
boolean b = bean.saveBatch(placeCheck.getPatrolRecordVOList());
if (b) {
@@ -64,4 +78,26 @@
}
return false;
}
+
+ /**
+ * 查询场所检查表
+ *
+ * @param id 场所检查表ID
+ * @return 场所检查表
+ */
+ @Override
+ public PlaceCheckVO selectPlaceCheckById(Long id) {
+ return this.baseMapper.selectPlaceCheckById(id);
+ }
+
+ /**
+ * 查询场所检查表列表
+ *
+ * @param placeCheckDTO 场所检查表
+ * @return 场所检查表集合
+ */
+ @Override
+ public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO) {
+ return this.baseMapper.selectPlaceCheckList(placeCheckDTO);
+ }
}
--
Gitblit v1.9.3