From e30adfc0ed39bbb1d5ba5d16e383a84c221ec0c2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 13 Jul 2023 11:37:10 +0800
Subject: [PATCH] 巡查查询接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java | 2 +-
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 | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 12 +++++++++---
5 files changed, 15 insertions(+), 9 deletions(-)
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 a1b0d6f..d5e815a 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
@@ -149,8 +149,8 @@
* @return
*/
@GetMapping(value = "/getByTaskIdAndGroupId")
- public R getByTaskIdAndGroupId(String groupId,String taskId){
- List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
+ public R getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO){
+ List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(patrolRecordVO);
return R.data(list);
}
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 ac7030d..d52be67 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
@@ -21,7 +21,7 @@
PatrolRecordVO getPatrolRecordVO(@Param("itemId") Long itemId, @Param("taskId") String taskId);
- List<PatrolRecord> getByTaskIdAndGroupId(@Param("groupId") String groupId, @Param("taskId") String taskId);
+ List<PatrolRecord> getByTaskIdAndGroupId(@Param("vo") PatrolRecordVO patrolRecordVO);
List<PatrolGroupDTO> getHistoryRecord(@Param("vo") PatrolRecordVO patrolRecordVO);
}
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 172064d..3c7bda6 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
@@ -122,12 +122,18 @@
FROM SM_PATROL_GROUP A
INNER JOIN SM_PATROL_GROUP_ITEM B ON A.ID = B.GROUP_ID
WHERE 1=1
- <if test="groupId != null and groupId !=''">
- AND B.GROUP_ID = #{groupId}
+ <if test="vo.groupId != null and vo.groupId !=''">
+ AND B.GROUP_ID = #{vo.groupId}
</if>
ORDER BY B.GROUP_ID
)C ON C.ID = r.ITEM_ID
- WHERE TASK_ID = #{taskId} AND r.state = 0
+ WHERE r.state = 0
+ <if test="vo.taskId != null and vo.taskId !=''">
+ AND r.task_id = #{vo.taskId}
+ </if>
+ <if test="vo.flowTaskId != null and vo.flowTaskId !=''">
+ AND r.flow_task_id = #{vo.flowTaskId}
+ </if>
</select>
<resultMap id="patrolGroupDTO" type="cn.gistack.sm.patrol.dto.PatrolGroupDTO">
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 1151cf2..59530c1 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
@@ -53,7 +53,7 @@
*/
List getItemByItemIds(String itemIds, String groupId, String taskId);
- List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId);
+ List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO);
Boolean updateThenSaveBatch(RecordBatchVO recordBatchVO);
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 ba685c4..d09d2a2 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
@@ -78,8 +78,8 @@
}
@Override
- public List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId) {
- return baseMapper.getByTaskIdAndGroupId(groupId,taskId);
+ public List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getByTaskIdAndGroupId(patrolRecordVO);
}
@Override
--
Gitblit v1.9.3