From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
index a3ce5b5..dfee0a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.patrol.service.impl;
+import cn.gistack.sm.patrol.dto.PatrolGroupDTO;
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
@@ -8,26 +9,29 @@
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
+import cn.gistack.sm.patrol.vo.RecordBatchVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
+@AllArgsConstructor
public class PatrolRecordServiceImpl extends BaseServiceImpl<PatrolRecordMapper, PatrolRecord> implements IPatrolRecordService {
- @Autowired
IPatrolGroupItemService patrolGroupItemService;
@Override
- public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
- return page.setRecords(baseMapper.selectPatrolRecord(patrolRecord));
+ public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord) {
+ return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
}
@Override
@@ -54,4 +58,43 @@
public List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds) {
return baseMapper.getByTaskIdAndItemId(taskId,itemIds);
}
+
+ @Override
+ public List getItemByItemIds(String itemIds,String groupId,String taskId) {
+ List<PatrolGroupItem> itemList = patrolGroupItemService.getItemByItemIds(itemIds, groupId);
+ List<PatrolRecord> patrolRecordList = new ArrayList<>();
+ itemList.forEach(item->{
+ PatrolRecordVO one = baseMapper.getPatrolRecordVO(item.getId(),taskId);
+ if (ObjectUtil.isNotEmpty(one)){
+ patrolRecordList.add(one);
+ }
+ });
+
+ if (patrolRecordList.size()>0){
+ return patrolRecordList;
+ }else {
+ return itemList;
+ }
+ }
+
+ @Override
+ public List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getByTaskIdAndGroupId(patrolRecordVO);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateThenSaveBatch(RecordBatchVO recordBatchVO) {
+
+
+ boolean b = updateBatchById(recordBatchVO.getUpdateList());
+ boolean b1 = saveBatch(recordBatchVO.getAddList());
+
+ return b&&b1;
+ }
+
+ @Override
+ public List<PatrolGroupDTO> getHistoryRecord(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getHistoryRecord(patrolRecordVO);
+ }
}
--
Gitblit v1.9.3