From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 1bf372a..9f1d241 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -235,10 +235,10 @@
}
/**
- * 管理端--单人详情
+ * 单人详情
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
- @ApiOperation("管理端--单人详情")
+ @ApiOperation("单人详情")
@PostMapping("recordSolo")
public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
return recordService.recordSolo(recordSoloParam);
@@ -282,8 +282,8 @@
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeMonth')")
@ApiOperation("单兵端--巡检日历")
@PostMapping("executeMonth")
- public Results executeMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
- return recordService.executeMonth(recordMonthParam);
+ public Results executeMonth(@RequestBody RecordMonthExParam recordMonthExParam) throws ParseException {
+ return recordService.executeMonth(recordMonthExParam);
}
/**
@@ -292,18 +292,37 @@
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
@ApiOperation("单兵端--点击日历获取该人员下所有地点打卡记录")
@PostMapping("executeDetails")
- public Results executeDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
- return recordService.executeDetails(recordDetailsParam);
+ public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
+ return recordService.executeDetails(recordDetailsExParam);
}
/**
* 单兵端--单人详情
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
- @ApiOperation("单兵端--单人详情")
+// @ApiOperation("单兵端--单人详情")
@PostMapping("executeSolo")
public Results executeSolo(@RequestBody RecordSoloExParam recordSoloExParam) throws ParseException {
return recordService.executeSolo(recordSoloExParam);
}
+ /**
+ * 单兵端--打卡前
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordBefore')")
+ @ApiOperation("单兵端--打卡前")
+ @PostMapping("recordBefore")
+ public Results recordBefore(@RequestBody RecordBeforeParam recordBeforeParam) throws ParseException {
+ return recordService.recordBefore(recordBeforeParam);
+ }
+
+ /**
+ * 单兵端--循环
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:son')")
+ @ApiOperation("单兵端--循环")
+ @GetMapping("son")
+ public Results son(){
+ return recordService.son();
+ }
}
--
Gitblit v1.9.3