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/IPatrolRecordService.java | 9 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 21 ++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java | 12 -----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 13 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java | 11 ++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 13 ++++++
9 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
index db6b5e7..a35cc93 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
@@ -124,17 +124,7 @@
return R.data(patrolGroupItem);
}
- /**
- * 通过itemIds查询
- *
- * @return
- */
- @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
- @GetMapping(value = "/getItemByItemIds")
- public R getItemByItemIds(String itemIds,String groupId){
- List<PatrolGroupItem> list = patrolGroupItemService.getItemByItemIds(itemIds,groupId);
- return R.data(list);
- }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
index b2e03f3..8b8e7fe 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
+import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
@@ -128,5 +129,17 @@
return R.data(list);
}
+ /**
+ * 通过itemIds查询
+ *
+ * @return
+ */
+ @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
+ @GetMapping(value = "/getItemByItemIds")
+ public R getItemByItemIds(String itemIds,String groupId,String taskId){
+ List list = patrolRecordService.getItemByItemIds(itemIds,groupId,taskId);
+ return R.data(list);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
index b6559e1..1732427 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
@@ -48,7 +48,7 @@
*/
@ApiModelProperty("巡查现场图片")
@TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
- private Object images;
+ private Object[] images;
/**
* 巡查内容
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
index edd9e43..e401255 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
@@ -17,4 +17,6 @@
PatrolRecord selectPatrolRecordByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemId") Long itemId);
List<PatrolRecordVO> getByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemIds") String itemIds);
+
+ PatrolRecordVO getPatrolRecordVO(@Param("itemId") Long itemId, @Param("taskId") String taskId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index 2639448..70428af 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -20,6 +20,10 @@
<result property="description" column="description"/>
<result property="patrolTime" column="update_time"/>
<result property="toUserId" column="to_user_id"/>
+
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+
</resultMap>
<select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
@@ -71,4 +75,13 @@
LEFT JOIN BLADEX.SM_PATROL_TASK t ON t.id = r.task_id
where r.task_id = #{taskId}
</select>
+ <select id="getPatrolRecordVO" resultMap="selectPatrolRecordList">
+ SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,r.create_user,r.create_dept,
+ i.items_name itemsName,i.description
+ FROM sm_patrol_record r
+ LEFT JOIN sm_patrol_group_item i ON i.id = r.item_id
+ WHERE r.is_deleted = 0
+ AND r.item_id = #{itemId}
+ AND r.task_id = #{taskId}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
index bd413fa..910d6c7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
@@ -18,5 +18,5 @@
PatrolGroupItemVO getPatrolGroupItemVOById(Long id);
- List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId);
+ List<PatrolGroupItem> getItemByItemIds(String itemIds, String groupId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
index 0132642..e9ecf63 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
@@ -24,4 +24,13 @@
List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds);
List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds);
+
+ /**
+ * 用于app巡查上报
+ * @param itemIds
+ * @param groupId
+ * @param taskId
+ * @return
+ */
+ List getItemByItemIds(String itemIds, String groupId, String taskId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
index 031c289..89de9f1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
@@ -1,23 +1,28 @@
package cn.gistack.sm.patrol.service.impl;
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
+import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.mapper.PatrolGroupItemMapper;
import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
+import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
+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.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
import java.util.List;
/**
* @Description: 巡查指标项目
*/
@Service
+@AllArgsConstructor
public class PatrolGroupItemServiceImpl extends BaseServiceImpl<PatrolGroupItemMapper, PatrolGroupItem> implements IPatrolGroupItemService {
-
@Override
public List<PatrolGroupItemVO> selectPatrolGroupItemList(PatrolGroupItemVO patrolGroupItem) {
@@ -35,7 +40,9 @@
}
@Override
- public List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId) {
+ public List<PatrolGroupItem> getItemByItemIds(String itemIds, String groupId) {
return baseMapper.getItemByItemIds(itemIds,groupId);
}
+
+
}
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