From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 4970d48..5dd4f92 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
@@ -1,5 +1,6 @@
package com.ruoyi.app.patrolplan.controller;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -13,6 +14,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
+import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -206,11 +208,20 @@
* 宸℃鎵撳崱
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:record')")
- @Log(title = "app宸℃璁″垝", businessType = BusinessType.UPDATE)
@ApiOperation("宸℃鎵撳崱")
@PostMapping("record")
public Results edit(@RequestBody ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
return recordService.record(ardAppPatrolpointRecord);
}
+ /**
+ * 宸℃鏃ュ巻
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
+ @ApiOperation("宸℃鏃ュ巻")
+ @PostMapping("recordMonth")
+ public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ return recordService.recordMonth(ardAppPatrolpointRecordParam);
+ }
+
}
--
Gitblit v1.9.3