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/IPatrolRecordService.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java | 6 ++++++
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 | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 6 +++++-
6 files changed, 15 insertions(+), 5 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 ff5b83d..a4aff95 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
@@ -39,7 +39,7 @@
*/
@ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolRecord patrolRecord, Query query) {
+ public R queryPageList(PatrolRecordVO patrolRecord, Query query) {
IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
return R.data(pageList);
}
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 d52be67..b44d96f 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
@@ -11,7 +11,7 @@
import java.util.List;
public interface PatrolRecordMapper extends BaseMapper<PatrolRecord> {
- List<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page,@Param("patrolRecord") PatrolRecord patrolRecord);
+ List<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page,@Param("patrolRecord") PatrolRecordVO patrolRecord);
PatrolRecordVO getDetail(@Param("id") String id);
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 dbb4ebc..2809043 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
@@ -38,10 +38,11 @@
record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.create_time,record.update_time,record.solution,
task.route_coordinates taskRoute,task.title taskName,
item.items_name itemsName,item.description,
- u.real_name
+ u.real_name,res."name" resName
FROM SM_PATROL_RECORD record
LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
LEFT JOIN sm_patrol_task task ON task.id = record.task_id
+ LEFT JOIN sjzt_md."att_res_base" res ON task.project_id = res."guid"
LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
LEFT JOIN BLADE_USER u ON u.id = record.create_user
WHERE record.is_deleted = 0
@@ -54,6 +55,9 @@
<if test="patrolRecord.taskId !=null and patrolRecord.taskId !=''">
AND record.task_id = #{patrolRecord.taskId}
</if>
+ <if test="patrolRecord.resName != null and patrolRecord.resName !=''">
+ AND res."name" LIKE CONCAT('%',#{patrolRecord.resName},'%')
+ </if>
ORDER BY record.create_time DESC
</select>
<select id="getDetail" resultMap="selectPatrolRecordList">
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 59530c1..da8468a 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
@@ -19,7 +19,7 @@
* @param patrolRecord
* @return
*/
- IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord);
+ IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord);
/**
* 获取详情
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 d09d2a2..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
@@ -30,7 +30,7 @@
IPatrolGroupItemService patrolGroupItemService;
@Override
- public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
+ public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord) {
return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
index 2126e4e..9ae2fd3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.patrol.entity.PatrolRecord;
import lombok.Data;
+import org.springframework.data.annotation.Transient;
@Data
public class PatrolRecordVO extends PatrolRecord {
@@ -52,4 +53,9 @@
* 任务名称
*/
private String taskName;
+
+ /**
+ * 水库名称
+ */
+ private String resName;
}
--
Gitblit v1.9.3