From 686c8a636ac3059b2f5dd07eb989e4dbd7cb7669 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 11:13:30 +0800
Subject: [PATCH] app查询巡检项接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 debaeb4..f94b70b 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
@@ -10,6 +10,7 @@
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
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;
@@ -21,8 +22,8 @@
import java.util.List;
@Service
+@AllArgsConstructor
public class PatrolRecordServiceImpl extends BaseServiceImpl<PatrolRecordMapper, PatrolRecord> implements IPatrolRecordService {
- @Autowired
IPatrolGroupItemService patrolGroupItemService;
@Override
@@ -54,4 +55,22 @@
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;
+ }
+ }
}
--
Gitblit v1.9.3